Fix automake warnings/errors:

-Remove INCLUDES
-Use subdir-objects
-Remove conditionals

11 files changed, 33 insertions, 41 deletions

diff --git a/XMPCore/source/Makefile.am b/XMPCore/source/Makefile.am
index 6ab6ef3..309d255 100644
--- a/XMPCore/source/Makefile.am
+++ b/XMPCore/source/Makefile.am
@@ -38,11 +38,10 @@
 
 noinst_LTLIBRARIES = libXMPCore.la
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/public/include
-
 AM_CXXFLAGS = -Wno-multichar -Wno-ctor-dtor-privacy \
 	-funsigned-char -fexceptions
-AM_CPPFLAGS = -Wall @XMPCORE_CPPFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/public/include \
+	-Wall @XMPCORE_CPPFLAGS@
 
 noinst_HEADERS =  \
 	XMPCore_Impl.hpp  XMPIterator.hpp \
diff --git a/XMPFiles/source/FileHandlers/Makefile.am b/XMPFiles/source/FileHandlers/Makefile.am
index 22783f0..ea2ec41 100644
--- a/XMPFiles/source/FileHandlers/Makefile.am
+++ b/XMPFiles/source/FileHandlers/Makefile.am
@@ -38,9 +38,8 @@
 
 noinst_LTLIBRARIES = libxmpfilehandlers.la
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/public/include
-
-AM_CPPFLAGS = -Wall @XMPCORE_CPPFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/public/include \
+	-Wall @XMPCORE_CPPFLAGS@
 
 
 libxmpfilehandlers_la_SOURCES = \
diff --git a/XMPFiles/source/FormatSupport/Makefile.am b/XMPFiles/source/FormatSupport/Makefile.am
index 6c57dca..c090716 100644
--- a/XMPFiles/source/FormatSupport/Makefile.am
+++ b/XMPFiles/source/FormatSupport/Makefile.am
@@ -41,12 +41,11 @@ noinst_HEADERS = IPTC_Support.hpp  PSIR_Support.hpp\
 	ReconcileLegacy.hpp  TIFF_Support.hpp  GIF_Support.hpp
 
 
-INCLUDES = -I$(top_srcdir) \
-	-I$(top_srcdir)/public/include/
-
 AM_CXXFLAGS = -Wno-multichar -Wno-ctor-dtor-privacy \
 	-funsigned-char -fexceptions
-AM_CPPFLAGS = -Wall @XMPCORE_CPPFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir) \
+	-I$(top_srcdir)/public/include/ \
+	-Wall @XMPCORE_CPPFLAGS@
 
 libformatsupport_la_SOURCES = \
 	PackageFormat_Support.cpp PackageFormat_Support.hpp \
diff --git a/XMPFiles/source/Makefile.am b/XMPFiles/source/Makefile.am
index ae50890..6d1a1d3 100644
--- a/XMPFiles/source/Makefile.am
+++ b/XMPFiles/source/Makefile.am
@@ -38,12 +38,11 @@ SUBDIRS = FileHandlers FormatSupport NativeMetadataSupport PluginHandler
 
 noinst_LTLIBRARIES = libXMPFiles.la
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/public/include \
-	-I$(top_srcdir)/XMPFilesPlugins/api/source/
-
 AM_CXXFLAGS = -Wno-multichar -Wno-ctor-dtor-privacy \
 	-funsigned-char -fexceptions -fno-strict-aliasing
-AM_CPPFLAGS = -Wall @XMPCORE_CPPFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/public/include \
+	-I$(top_srcdir)/XMPFilesPlugins/api/source/ \
+	-Wall @XMPCORE_CPPFLAGS@
 
 noinst_HEADERS = XMPFiles.hpp XMPFiles_Impl.hpp HandlerRegistry.h
 
diff --git a/XMPFiles/source/NativeMetadataSupport/Makefile.am b/XMPFiles/source/NativeMetadataSupport/Makefile.am
index a58bff7..2606720 100644
--- a/XMPFiles/source/NativeMetadataSupport/Makefile.am
+++ b/XMPFiles/source/NativeMetadataSupport/Makefile.am
@@ -37,12 +37,11 @@
 
 noinst_LTLIBRARIES = libnativemetadata.la
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/public/include \
-	-I$(top_srcdir)/XMPFilesPlugins/api/source/
-
 AM_CXXFLAGS = -Wno-multichar -Wno-ctor-dtor-privacy \
 	-funsigned-char -fexceptions -fno-strict-aliasing
-AM_CPPFLAGS = -Wall @XMPCORE_CPPFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/public/include \
+	-I$(top_srcdir)/XMPFilesPlugins/api/source/ \
+	-Wall @XMPCORE_CPPFLAGS@
 
 libnativemetadata_la_SOURCES = \
 	IMetadata.cpp IMetadata.h \
diff --git a/XMPFiles/source/PluginHandler/Makefile.am b/XMPFiles/source/PluginHandler/Makefile.am
index 44fef16..0c0a6f6 100644
--- a/XMPFiles/source/PluginHandler/Makefile.am
+++ b/XMPFiles/source/PluginHandler/Makefile.am
@@ -37,12 +37,11 @@
 
 noinst_LTLIBRARIES = libpluginhandler.la
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/public/include \
-	-I$(top_srcdir)/XMPFilesPlugins/api/source/
-
 AM_CXXFLAGS = -Wno-multichar -Wno-ctor-dtor-privacy \
 	-funsigned-char -fexceptions -fno-strict-aliasing
-AM_CPPFLAGS = -Wall @XMPCORE_CPPFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/public/include \
+	-I$(top_srcdir)/XMPFilesPlugins/api/source/ \
+	-Wall @XMPCORE_CPPFLAGS@
 
 if MAC_ENV
 PLATFORM_UTILS=OS_Utils_Mac.cpp
diff --git a/configure.ac b/configure.ac
index e33af9e..97adb65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl the same distribution terms as the rest of that program.
 
 AC_PREREQ(2.50)
 AC_INIT(exempi,2.4.0)
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects])
 AM_MAINTAINER_MODE
 m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
 AM_SILENT_RULES([yes])
diff --git a/exempi/Makefile.am b/exempi/Makefile.am
index 3f47136..4a65f91 100644
--- a/exempi/Makefile.am
+++ b/exempi/Makefile.am
@@ -46,13 +46,11 @@ exempi_SOURCES = main.cpp
 exempi_CPPFLAGS = -I$(srcdir)/..
 exempi_LDADD = libexempi.la
 
-INCLUDES = -I$(top_srcdir)/public/include -I$(top_srcdir)/XMPCore/source \
-	-I$(top_srcdir)/build/ \
-	-I$(top_srcdir) \
-        -I$(top_srcdir)/source/common/ \
-	$(NULL)
+AM_CPPFLAGS = -I$(top_srcdir)/public/include -I$(top_srcdir)/XMPCore/source \
+	-I$(top_srcdir)/build/ -I$(top_srcdir) \
+	-I$(top_srcdir)/source/common/ \
+	-Wall -D@EXEMPI_PLATFORM_DEF@=1
 
-AM_CPPFLAGS = -Wall -D@EXEMPI_PLATFORM_DEF@=1
 lib_LTLIBRARIES = libexempi.la
 
 pkgconfig_DATA = exempi-@EXEMPI_MAJOR_VERSION@.pc
diff --git a/exempi/tests/Makefile.am b/exempi/tests/Makefile.am
index 85e227a..a1de912 100644
--- a/exempi/tests/Makefile.am
+++ b/exempi/tests/Makefile.am
@@ -35,16 +35,17 @@
 #
 
 
-INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/public/include -I$(top_srcdir)
-if WITH_UNIT_TEST
+
 AUTOMAKE_OPTIONS = parallel-tests
+TEST_EXTENSIONS = .sh
+
+if WITH_UNIT_TEST
 check_PROGRAMS = testexempicore testserialise testwritenewprop \
 	testtiffleak testxmpfiles testxmpfileswrite \
 	test3 testinit testfdo18635 testfdo83313 testcpp
 TESTS = testcore.sh testinit testexempicore testserialise testwritenewprop \
 	testtiffleak testxmpfiles testxmpfileswrite \
 	test3 testfdo18635 testfdo83313 testcpp
-TEST_EXTENSIONS = .sh
 TESTS_ENVIRONMENT = TEST_DIR=$(srcdir) BOOST_TEST_CATCH_SYSTEM_ERRORS=no VALGRIND="$(VALGRIND)"
 LOG_COMPILER = $(VALGRIND)
 endif
@@ -58,6 +59,7 @@ EXTRA_DIST = $(check_DATA) $(check_SCRIPTS)
 CLEANFILES = test.jpg
 
 AM_CXXFLAGS = @BOOST_CPPFLAGS@
+AM_CPPFLAGS = -I$(srcdir)/.. -I$(top_srcdir)/public/include -I$(top_srcdir)
 
 testinit_SOURCES = testinit.cpp utils.cpp
 testinit_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
diff --git a/samples/source/Makefile.am b/samples/source/Makefile.am
index 1430c3a..5ebc13d 100644
--- a/samples/source/Makefile.am
+++ b/samples/source/Makefile.am
@@ -44,8 +44,9 @@ noinst_PROGRAMS = xmpcoverage xmpfilescoverage dumpxmp dumpmainxmp\
 
 AM_CXXFLAGS = -fexceptions -funsigned-char -fPIC \
 	-Wno-multichar -Wno-ctor-dtor-privacy
+AM_CPPFLAGS = -I$(top_srcdir)/public/include -I$(top_srcdir) \
+	-D@EXEMPI_PLATFORM_DEF@=1 -D_FILE_OFFSET_BITS=64
 
-AM_CPPFLAGS = -D@EXEMPI_PLATFORM_DEF@=1 -D_FILE_OFFSET_BITS=64
 XMPLIBS = $(top_builddir)/XMPCore/source/libXMPCore.la \
 	$(top_builddir)/XMPFiles/source/libXMPFiles.la \
 	$(top_builddir)/source/libxmpcommon.la -lexpat -lz \
@@ -56,8 +57,6 @@ if UNIX_ENV
 XMPLIBS += -lrt
 endif
 
-INCLUDES = -I$(top_srcdir)/public/include -I$(top_srcdir)
-
 noinst_LTLIBRARIES = libsamplescommon.la
 libsamplescommon_la_SOURCES = common/DumpFile.cpp common/DumpFile.h \
 	common/Log.cpp common/Log.h \
diff --git a/third-party/zuid/interfaces/Makefile.am b/third-party/zuid/interfaces/Makefile.am
index 7a036fe..2a602a1 100644
--- a/third-party/zuid/interfaces/Makefile.am
+++ b/third-party/zuid/interfaces/Makefile.am
@@ -35,14 +35,13 @@
 #
 
 
-INCLUDES = -I$(top_srcdir)/public/include \
-	-I$(top_srcdir)/public/include/client-glue \
-	-I$(top_srcdir)/build/ \
-	-I$(top_srcdir)
-
 AM_CXXFLAGS = -Wno-multichar -Wno-ctor-dtor-privacy \
 	-funsigned-char -fexceptions
-AM_CPPFLAGS = -Wall @XMPCORE_CPPFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/public/include \
+	-I$(top_srcdir)/public/include/client-glue \
+	-I$(top_srcdir)/build/ \
+	-I$(top_srcdir) \
+	-Wall @XMPCORE_CPPFLAGS@
 
 noinst_LTLIBRARIES = libmd5.la