From e0428920eb35a2746fb44b7b5a8af8639f7f911d Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Wed, 26 Aug 2015 18:42:48 +0000 Subject: [PATCH] Add samples targets (exiv2json etc) to toplevel Makefile. --- Makefile | 6 ++++++ config/Makefile.in | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/Makefile b/Makefile index 7d381fbb..b94542e0 100644 --- a/Makefile +++ b/Makefile @@ -79,6 +79,12 @@ teste testx testv: exiv2 conntest exifprint remotetest: cd src && $(MAKE) $0 +addmoddel exifcomment exifvalue httptest iptctest mmap-test stringto-test \ +exifdata iotest key-test path-test taglist write2-test write-test \ +convert-test exifdata-test exiv2json iptceasy largeiptc-test prevtest tiff-test \ +easyaccess-test geotag iptcprint metacopy werror-test xmpparser-test xmpsample xmpparse : + cd samples && $(MAKE) $(MAKECMDGOALS) + MAJOR=$(shell grep "define.*EXIV2_.*_VERSION .*\\d*" src/version.hpp | grep MAJOR | sed -e 's/EXIV2//g' | tr -dC [:digit:]) MINOR=$(shell grep "define.*EXIV2_.*_VERSION .*\\d*" src/version.hpp | grep MINOR | sed -e 's/EXIV2//g' | tr -dC [:digit:]) VERSION=exiv2-$(MAJOR).$(MINOR) diff --git a/config/Makefile.in b/config/Makefile.in index 0a281834..82074f0f 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -79,6 +79,12 @@ teste testx testv: exiv2 conntest exifprint remotetest: cd src && $(MAKE) $0 +addmoddel exifcomment exifvalue httptest iptctest mmap-test stringto-test \ +exifdata iotest key-test path-test taglist write2-test write-test \ +convert-test exifdata-test exiv2json iptceasy largeiptc-test prevtest tiff-test \ +easyaccess-test geotag iptcprint metacopy werror-test xmpparser-test xmpsample xmpparse : + cd samples && $(MAKE) $0 + MAJOR=$(shell grep "define.*EXIV2_.*_VERSION .*\\d*" src/version.hpp | grep MAJOR | sed -e 's/EXIV2//g' | tr -dC [:digit:]) MINOR=$(shell grep "define.*EXIV2_.*_VERSION .*\\d*" src/version.hpp | grep MINOR | sed -e 's/EXIV2//g' | tr -dC [:digit:]) VERSION=exiv2-$(MAJOR).$(MINOR)