[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:43:30 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=7b859e0
The following commit has been merged in the master branch:
commit 7b859e026f083def78c682cd86a56607575a1dc1
Author: Robin Mills <robin at clanmills.com>
Date: Mon Oct 29 06:24:56 2012 +0000
Move metacopy/path-test/taglist applications (and build code) into samples. TODO: fix msvc/msvc64.
---
config/Makefile.in | 3 ++-
samples/CMakeLists.txt | 19 ++++++++++++++++--
samples/Makefile | 15 ++++++++++++--
{src => samples}/metacopy.cpp | 0
{src => samples}/metacopy.hpp | 0
{src => samples}/path-test.cpp | 0
{src => samples}/taglist.cpp | 0
src/CMakeLists.txt | 45 ++++++------------------------------------
src/Makefile | 39 ++++++------------------------------
9 files changed, 44 insertions(+), 77 deletions(-)
diff --git a/config/Makefile.in b/config/Makefile.in
index bcbd067..ea2585d 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -98,7 +98,8 @@ mostlyclean clean: config/config.mk
# for packaging.
distclean: clean
rm -f config.log config.status libtool
- rm -f *~ *.bak *#
+ rm -f *~ *.bak
+ rm -rf bin
# This removes almost everything, including the configure script!
maintainer-clean: distclean
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 2d28547..c463f6a 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -18,8 +18,7 @@ if (MSVC)
# link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../zlib-1.2.7/$(ConfigurationName))
endif()
endif()
-include_directories("${CMAKE_SOURCE_DIR}/include")
-
+include_directories("${CMAKE_SOURCE_DIR}/include" "${CMAKE_SOURCE_DIR}/src")
SET( SAMPLES addmoddel.cpp
convert-test.cpp
@@ -37,6 +36,7 @@ SET( SAMPLES addmoddel.cpp
mmap-test.cpp
prevtest.cpp
stringto-test.cpp
+ taglist.cpp
tiff-test.cpp
werror-test.cpp
write-test.cpp
@@ -53,5 +53,20 @@ FOREACH(entry ${SAMPLES})
TARGET_LINK_LIBRARIES( ${target} exiv2lib )
ENDFOREACH(entry ${SAMPLES})
+###################################
+# metacopy/path-test sample applications require utils.cpp support
+SET( MC_SRC metacopy.cpp ../src/utils.cpp )
+ADD_EXECUTABLE( metacopy ${MC_SRC} )
+TARGET_LINK_LIBRARIES( metacopy exiv2lib )
+INSTALL( TARGETS metacopy ${INSTALL_TARGET_STANDARD_ARGS} )
+
+SET( PATHTEST_SRC path-test.cpp ../src/utils.cpp )
+ADD_EXECUTABLE( pathtest ${PATHTEST_SRC} )
+SET_TARGET_PROPERTIES( pathtest PROPERTIES OUTPUT_NAME path-test )
+TARGET_LINK_LIBRARIES( pathtest exiv2lib )
+INSTALL( TARGETS pathtest ${INSTALL_TARGET_STANDARD_ARGS} )
+
# That's all Folks!
##
+
+
diff --git a/samples/Makefile b/samples/Makefile
index 198b15c..b41163a 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -67,9 +67,12 @@ BINSRC = addmoddel.cpp \
iptctest.cpp \
key-test.cpp \
largeiptc-test.cpp \
+ metacopy.cpp \
mmap-test.cpp \
+ path-test.cpp \
prevtest.cpp \
stringto-test.cpp \
+ taglist.cpp \
tiff-test.cpp \
werror-test.cpp \
write-test.cpp \
@@ -78,6 +81,7 @@ BINSRC = addmoddel.cpp \
xmpparser-test.cpp \
xmpsample.cpp
+
# ******************************************************************************
# Initialisations
SHELL = /bin/sh
@@ -103,7 +107,7 @@ endif
samples: $(BINARY)
$(BINOBJ): %.o: %.cpp
- $(COMPILE.cc) -o $@ $<
+ $(COMPILE.cc) -I../src -o $@ $<
@$(MAKEDEPEND)
@$(POSTDEPEND)
@@ -128,7 +132,14 @@ relink: binclean samples
# link expat directly to geotag
geotag : geotag.o
- $(LIBTOOL) --mode=link $(LINK.cc) -lexpat -o $@ $@.o
+ $(LIBTOOL) --mode=link $(LINK.cc) -lexpat $@.o -o ../bin/$@
+
+# link applications which require utils.cpp support
+metacopy: metacopy.o ../src/utils.o
+ $(LIBTOOL) --mode=link $(LINK.cc) $@.o ../src/utils.o -o ../bin/$@
+
+path-test: path-test.o ../src/utils.o
+ $(LIBTOOL) --mode=link $(LINK.cc) $@.o ../src/utils.o -o ../bin/$@
# Remove binaries, e.g., to relink them
binclean:
diff --git a/src/metacopy.cpp b/samples/metacopy.cpp
similarity index 100%
rename from src/metacopy.cpp
rename to samples/metacopy.cpp
diff --git a/src/metacopy.hpp b/samples/metacopy.hpp
similarity index 100%
rename from src/metacopy.hpp
rename to samples/metacopy.hpp
diff --git a/src/path-test.cpp b/samples/path-test.cpp
similarity index 100%
rename from src/path-test.cpp
rename to samples/path-test.cpp
diff --git a/src/taglist.cpp b/samples/taglist.cpp
similarity index 100%
rename from src/taglist.cpp
rename to samples/taglist.cpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7dfe16d..1b9282c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -158,20 +158,6 @@ SET( EXIV2_SRC exiv2.cpp
utils.cpp
)
-# taglist sample application
-SET( TAGLIST_SRC taglist.cpp )
-
-
-# metacopy sample application
-SET( MC_SRC metacopy.cpp
- utils.cpp
-)
-
-# pathtest sample application
-SET( PATHTEST_SRC path-test.cpp
- utils.cpp
-)
-
##
# modify source lists to suit environment
IF(NOT HAVE_TIMEGM )
@@ -205,16 +191,16 @@ SET_TARGET_PROPERTIES( exiv2lib PROPERTIES
)
if ( MSVC )
- source_group("Header Files" FILES ${LIBEXIV2_HDR} )
+ source_group("Header Files" FILES ${LIBEXIV2_HDR} )
TARGET_LINK_LIBRARIES( exiv2lib ${EXPAT_LIBRARIES} )
else()
TARGET_LINK_LIBRARIES( exiv2lib dl ${EXPAT_LIBRARIES} )
endif()
if( EXIV2_ENABLE_LIBXMP )
- ADD_DEPENDENCIES( exiv2lib xmp )
- LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH}/$(ConfigurationName))
- TARGET_LINK_LIBRARIES( exiv2lib xmp )
+ ADD_DEPENDENCIES( exiv2lib xmp )
+ LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH}/$(ConfigurationName))
+ TARGET_LINK_LIBRARIES( exiv2lib xmp )
ENDIF()
IF( EXIV2_ENABLE_PNG )
@@ -232,11 +218,11 @@ IF( EXIV2_ENABLE_PNG )
ENDIF()
IF( EXIV2_ENABLE_NLS )
- TARGET_LINK_LIBRARIES( exiv2lib ${LIBINTL_LIBRARIES} )
+ TARGET_LINK_LIBRARIES( exiv2lib ${LIBINTL_LIBRARIES} )
ENDIF( EXIV2_ENABLE_NLS )
IF( ICONV_FOUND )
- TARGET_LINK_LIBRARIES( exiv2lib ${ICONV_LIBRARIES} )
+ TARGET_LINK_LIBRARIES( exiv2lib ${ICONV_LIBRARIES} )
ENDIF( ICONV_FOUND )
IF (CYGWIN)
@@ -289,25 +275,6 @@ TARGET_LINK_LIBRARIES( exiv2 exiv2lib )
INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} )
# ******************************************************************************
-# metacopy sample application
-ADD_EXECUTABLE( metacopy ${MC_SRC} )
-TARGET_LINK_LIBRARIES( metacopy exiv2lib )
-INSTALL( TARGETS metacopy ${INSTALL_TARGET_STANDARD_ARGS} )
-
-# ******************************************************************************
-# taglist sample application
-ADD_EXECUTABLE( taglist ${TAGLIST_SRC} )
-TARGET_LINK_LIBRARIES( taglist exiv2lib )
-INSTALL( TARGETS taglist ${INSTALL_TARGET_STANDARD_ARGS} )
-
-# ******************************************************************************
-# path-test sample application
-ADD_EXECUTABLE( pathtest ${PATHTEST_SRC} )
-SET_TARGET_PROPERTIES( pathtest PROPERTIES OUTPUT_NAME path-test )
-TARGET_LINK_LIBRARIES( pathtest exiv2lib )
-INSTALL( TARGETS pathtest ${INSTALL_TARGET_STANDARD_ARGS} )
-
-# ******************************************************************************
# Headers
INSTALL( FILES ${LIBEXIV2_HDR} DESTINATION include/exiv2 )
diff --git a/src/Makefile b/src/Makefile
index b6d826f..fab7ca7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -103,7 +103,7 @@ CCSRC += preview.cpp \
psdimage.cpp \
quicktimevideo.cpp \
rafimage.cpp \
- riffvideo.cpp \
+ riffvideo.cpp \
rw2image.cpp \
samsungmn.cpp \
sigmamn.cpp \
@@ -125,10 +125,6 @@ ifndef HAVE_TIMEGM
CSRC = localtime.c
endif
-# Add source files of simple applications to this list
-# Todo: How can we still support crwedit.cpp, crwparse.cpp
-BINSRC = taglist.cpp
-
# Source files for the Exiv2 application
EXIV2MAIN = exiv2.cpp
EXIV2SRC = actions.cpp \
@@ -138,10 +134,6 @@ ifndef HAVE_TIMEGM
EXIVCSRC = localtime.c
endif
-# Source files for the metacopy sample application
-MCMAIN = metacopy.cpp
-MCSRC = utils.cpp
-
# ******************************************************************************
# Library
LIBRARY = libexiv2.la
@@ -172,25 +164,16 @@ HDR = $(CCHDR)
OBJ = $(CCOBJ) $(COBJ)
LOBJ = $(CCLOBJ) $(CLOBJ)
-BINOBJ = $(BINSRC:.cpp=.o)
-BINARY = $(BINSRC:.cpp=)
-EXECUTABLE = $(BINSRC:.cpp=$(EXEEXT))
-
EXIV2OBJ = $(EXIV2MAIN:.cpp=.o) $(EXIV2SRC:.cpp=.o)
EXIV2COBJ = $(EXIVCSRC:.c=.o)
EXIV2BIN = $(EXIV2MAIN:.cpp=)
EXIV2EXE = $(EXIV2MAIN:.cpp=$(EXEEXT))
-MCOBJ = $(MCMAIN:.cpp=.o) $(MCSRC:.cpp=.o)
-MCBIN = $(MCMAIN:.cpp=)
-MCEXE = $(MCMAIN:.cpp=$(EXEEXT))
-
ifdef DEP_TRACKING
DEP = $(CCSRC:%.cpp=$(DEPDIR)/%.d) $(CSRC:%.c=$(DEPDIR)/%.d) \
$(BINSRC:%.cpp=$(DEPDIR)/%.d) \
$(EXIV2MAIN:%.cpp=$(DEPDIR)/%.d) $(EXIV2SRC:%.cpp=$(DEPDIR)/%.d) \
- $(EXIVCSRC:%.c=$(DEPDIR)/%.d) $(MCMAIN:%.cpp=$(DEPDIR)/%.d) \
- $(MCSRC:%.cpp=$(DEPDIR)/%.d) $(DEPDIR)/path-test.d
+ $(EXIVCSRC:%.c=$(DEPDIR)/%.d)
endif
@@ -206,7 +189,7 @@ $(COBJ): %.o: %.c
@$(MAKEDEPEND)
@$(POSTDEPEND)
-$(sort $(BINOBJ) $(EXIV2OBJ) $(MCOBJ) path-test.o): %.o: %.cpp
+$(EXIV2OBJ): %.o: %.cpp
$(COMPILE.cc) -o $@ $<
@$(MAKEDEPEND)
@$(POSTDEPEND)
@@ -241,16 +224,12 @@ exv_conf.h: $(top_srcdir)/config/config.h
$(LIBTOOL): $(LIBTOOL_DEPS)
$(SHELL) $(top_srcdir)/config.status --recheck
-bin: lib $(BINARY) $(EXIV2BIN) $(MCBIN) path-test
+bin: lib $(EXIV2BIN)
lib: $(OBJ)
$(LIBTOOL) --mode=link $(LINK.cc) -o $(LIBRARY) $(LOBJ) -rpath $(libdir) -version-info $(EXIV2_LTVERSION) $(LIBS)
@touch lib
-path-test: path-test.o utils.o
- mkdir -pv ../bin 2>&1 > /dev/null
- $(CXX) $(CXXFLAGS) path-test.o utils.o -o ../bin/$@
-
$(BINARY): %: %.o lib
@$(LIBTOOL) --mode=link $(LINK.cc) -o $@ $(LIBRARY) $@.o -rpath $(libdir)
@@ -258,10 +237,6 @@ $(EXIV2BIN): lib $(EXIV2OBJ) $(EXIV2COBJ)
mkdir -pv ../bin 2>&1 > /dev/null
@$(LIBTOOL) --mode=link $(LINK.cc) -o ../bin/$@ $(LIBRARY) $(EXIV2OBJ) $(EXIV2COBJ) -rpath $(libdir)
-$(MCBIN): lib $(MCOBJ)
- mkdir -pv ../bin 2>&1 > /dev/null
- @$(LIBTOOL) --mode=link $(LINK.cc) -o ../bin/$@ $(LIBRARY) $(MCOBJ) -rpath $(libdir)
-
install-header:
$(INSTALL_DIRS) $(DESTDIR)$(incdir)
@list='$(HDR)'; for p in $$list; do \
@@ -317,15 +292,13 @@ mostlyclean:
$(RM) core
$(RM) $(CCSRC:.cpp=.ii)
$(RM) lib
- $(RM) path-test.o
$(RM) exv_conf.h
$(RM) $(CCSRC:%.cpp=.libs/%.d) $(CSRC:%.c=.libs/%.d)
- @$(LIBTOOL) --mode=clean $(RM) $(LOBJ) $(sort $(BINOBJ) $(EXIV2OBJ) $(EXIV2COBJ) $(MCOBJ))
+ @$(LIBTOOL) --mode=clean $(RM) $(LOBJ) $(sort $(EXIV2OBJ) $(EXIV2COBJ) )
clean: mostlyclean
@$(LIBTOOL) --mode=clean $(RM) $(LIBRARY)
- @$(LIBTOOL) --mode=clean $(RM) $(EXECUTABLE) $(EXIV2EXE) $(MCEXE)
- @$(LIBTOOL) --mode=clean $(RM) path-test$(EXEEXT)
+ @$(LIBTOOL) --mode=clean $(RM) $(EXECUTABLE) $(EXIV2EXE)
# Run `make distclean' from the top source directory to also remove
# files created by configuring the program.
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list