Fix automake warnings/errors:

-Remove INCLUDES
-Use subdir-objects
-Remove conditionals

5 files changed, 14 insertions, 19 deletions

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