Refactor CPPFLAGS for XMPCore.

Also define BanAllEntityUsage (see https://bugzilla.redhat.com/show_bug.cgi?id=888765)

5 files changed, 8 insertions, 26 deletions

diff --git a/XMPFiles/source/FileHandlers/Makefile.am b/XMPFiles/source/FileHandlers/Makefile.am
index 96524a2..22783f0 100644
--- a/XMPFiles/source/FileHandlers/Makefile.am
+++ b/XMPFiles/source/FileHandlers/Makefile.am
@@ -40,10 +40,8 @@ noinst_LTLIBRARIES = libxmpfilehandlers.la
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/public/include
 
-AM_CPPFLAGS = \
-	-D@EXEMPI_PLATFORM_DEF@=1 -DXMP_IMPL=1 -DXMP_ClientBuild=0 \
-	-DXMP_StaticBuild=1 \
-	-D_FILE_OFFSET_BITS=64 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1
+AM_CPPFLAGS = -Wall @XMPCORE_CPPFLAGS@
+
 
 libxmpfilehandlers_la_SOURCES = \
 AIFF_Handler.cpp AIFF_Handler.hpp\
diff --git a/XMPFiles/source/FormatSupport/Makefile.am b/XMPFiles/source/FormatSupport/Makefile.am
index c6be6a5..6c57dca 100644
--- a/XMPFiles/source/FormatSupport/Makefile.am
+++ b/XMPFiles/source/FormatSupport/Makefile.am
@@ -44,10 +44,9 @@ noinst_HEADERS = IPTC_Support.hpp  PSIR_Support.hpp\
 INCLUDES = -I$(top_srcdir) \
 	-I$(top_srcdir)/public/include/
 
-AM_CPPFLAGS = -Wno-multichar\
-	-D@EXEMPI_PLATFORM_DEF@=1 -DXMP_IMPL=1 -DXMP_ClientBuild=0 \
-	-DXMP_StaticBuild=1 \
-	-D_FILE_OFFSET_BITS=64 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1
+AM_CXXFLAGS = -Wno-multichar -Wno-ctor-dtor-privacy \
+	-funsigned-char -fexceptions
+AM_CPPFLAGS = -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 bcbafb1..ae50890 100644
--- a/XMPFiles/source/Makefile.am
+++ b/XMPFiles/source/Makefile.am
@@ -43,13 +43,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/public/include \
 
 AM_CXXFLAGS = -Wno-multichar -Wno-ctor-dtor-privacy \
 	-funsigned-char -fexceptions -fno-strict-aliasing
-AM_CPPFLAGS = -Wall\
-	-D@EXEMPI_PLATFORM_DEF@=1 -DXMP_IMPL=1 -DXMP_ClientBuild=0 \
-	-DXMP_StaticBuild=1 \
-	-D_FILE_OFFSET_BITS=64 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1 \
-	-DDISABLE_QUICKTIME
-
-
+AM_CPPFLAGS = -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 88be951..a58bff7 100644
--- a/XMPFiles/source/NativeMetadataSupport/Makefile.am
+++ b/XMPFiles/source/NativeMetadataSupport/Makefile.am
@@ -42,12 +42,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/public/include \
 
 AM_CXXFLAGS = -Wno-multichar -Wno-ctor-dtor-privacy \
 	-funsigned-char -fexceptions -fno-strict-aliasing
-AM_CPPFLAGS = -Wall\
-	-D@EXEMPI_PLATFORM_DEF@=1 -DXMP_IMPL=1 -DXMP_ClientBuild=0 \
-	-DXMP_StaticBuild=1 \
-	-D_FILE_OFFSET_BITS=64 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1 \
-	-DDISABLE_QUICKTIME
-
+AM_CPPFLAGS = -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 9c3d945..44fef16 100644
--- a/XMPFiles/source/PluginHandler/Makefile.am
+++ b/XMPFiles/source/PluginHandler/Makefile.am
@@ -42,11 +42,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/public/include \
 
 AM_CXXFLAGS = -Wno-multichar -Wno-ctor-dtor-privacy \
 	-funsigned-char -fexceptions -fno-strict-aliasing
-AM_CPPFLAGS = -Wall\
-	-D@EXEMPI_PLATFORM_DEF@=1 -DXMP_IMPL=1 -DXMP_ClientBuild=0 \
-	-DXMP_StaticBuild=1 \
-	-D_FILE_OFFSET_BITS=64 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1 \
-	-DDISABLE_QUICKTIME
+AM_CPPFLAGS = -Wall @XMPCORE_CPPFLAGS@
 
 if MAC_ENV
 PLATFORM_UTILS=OS_Utils_Mac.cpp