changed INCLUDE to AM_CPPFLAGS, upon the recommendation of automake w…

…arnings. Signed-off-by: Cary Phillips <cary@ilm.com>
AcademySoftwareFoundation · Jul 19, 2019 · f91edef · f91edef
1 parent 76cb1ef
commit f91edef
Show file tree

Hide file tree

Showing 28 changed files with 28 additions and 28 deletions.
diff --git a/IlmBase/Half/Makefile.am b/IlmBase/Half/Makefile.am
@@ -5,7 +5,7 @@
 
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/config
+AM_CPPFLAGS = -I$(top_srcdir)/config
 
 lib_LTLIBRARIES = libHalf.la
 

diff --git a/IlmBase/HalfTest/Makefile.am b/IlmBase/HalfTest/Makefile.am
@@ -14,7 +14,7 @@ HalfTest_SOURCES = main.cpp testArithmetic.cpp testArithmetic.h \
 		   testFunction.h testLimits.cpp testLimits.h testSize.cpp \
 		   testSize.h
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/Half -I$(top_srcdir)/config
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/Half -I$(top_srcdir)/config
 
 LDADD = -L$(top_builddir)/Half -lHalf
 

diff --git a/IlmBase/Iex/Makefile.am b/IlmBase/Iex/Makefile.am
@@ -5,7 +5,7 @@
 
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/config
+AM_CPPFLAGS = -I$(top_srcdir)/config
 
 lib_LTLIBRARIES = libIex.la
 

diff --git a/IlmBase/IexMath/Makefile.am b/IlmBase/IexMath/Makefile.am
@@ -19,7 +19,7 @@ endif
 
 libIexMath_la_LIBADD = ../Iex/libIex.la
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/Iex \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/Iex \
            -I$(top_srcdir)/config
 
 EXTRA_DIST = CMakeLists.txt
diff --git a/IlmBase/IexTest/Makefile.am b/IlmBase/IexTest/Makefile.am
@@ -9,7 +9,7 @@ check_PROGRAMS = IexTest
 
 IexTest_SOURCES = main.cpp testBaseExc.cpp testBaseExc.h
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/Iex -I$(top_srcdir)/config
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/Iex -I$(top_srcdir)/config
 
 LDADD = -L$(top_builddir)/Iex -lIex
 

diff --git a/IlmBase/IlmThread/Makefile.am b/IlmBase/IlmThread/Makefile.am
@@ -34,4 +34,4 @@ noinst_HEADERS =
 EXTRA_DIST = $(noinst_HEADERS) IlmThreadMutexWin32.cpp IlmThreadSemaphoreWin32.cpp \
 	     IlmThreadWin32.cpp CMakeLists.txt
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/Iex -I$(top_srcdir)/config
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/Iex -I$(top_srcdir)/config
diff --git a/IlmBase/Imath/Makefile.am b/IlmBase/Imath/Makefile.am
@@ -43,7 +43,7 @@ libImathinclude_HEADERS = ImathColorAlgo.h ImathMatrixAlgo.h ImathVec.h \
                           ImathNamespace.h ImathForward.h ImathExport.h \
                           ImathFrustumTest.h
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/Iex -I$(top_srcdir)/Half \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/Iex -I$(top_srcdir)/Half \
 	   -I$(top_srcdir)/config
 
 EXTRA_DIST = CMakeLists.txt
diff --git a/IlmBase/ImathTest/Makefile.am b/IlmBase/ImathTest/Makefile.am
@@ -24,7 +24,7 @@ ImathTest_SOURCES = main.cpp testExtractEuler.cpp testExtractSHRT.cpp \
 		    testJacobiEigenSolver.cpp testJacobiEigenSolver.h \
 		    testFrustumTest.cpp testFrustumTest.h
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/Imath -I$(top_srcdir)/Iex -I$(top_srcdir)/Half \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/Imath -I$(top_srcdir)/Iex -I$(top_srcdir)/Half \
 	   -I$(top_srcdir)/config
 
 LDADD = -L$(top_builddir)/Imath -L$(top_builddir)/Iex -L$(top_builddir)/Half \

diff --git a/OpenEXR/IlmImf/Makefile.am b/OpenEXR/IlmImf/Makefile.am
@@ -194,7 +194,7 @@ noinst_HEADERS = ImfCompressor.h    \
 EXTRA_DIST = $(noinst_HEADERS) b44ExpLogTable.cpp b44ExpLogTable.h dwaLookups.cpp dwaLookups.h CMakeLists.txt
 
 
-INCLUDES = @ILMBASE_CXXFLAGS@ \
+AM_CPPFLAGS = @ILMBASE_CXXFLAGS@ \
 	   -I$(top_builddir) \
 	   -I$(top_srcdir)/config \
 	   $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)

diff --git a/OpenEXR/IlmImfExamples/Makefile.am b/OpenEXR/IlmImfExamples/Makefile.am
@@ -9,7 +9,7 @@ if BUILD_IMFEXAMPLES
 noinst_PROGRAMS = imfexamples
 endif
 
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
            -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
            @ILMBASE_CXXFLAGS@ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
 

diff --git a/OpenEXR/IlmImfFuzzTest/Makefile.am b/OpenEXR/IlmImfFuzzTest/Makefile.am
@@ -16,7 +16,7 @@ IlmImfFuzzTest_SOURCES = fuzzFile.cpp fuzzFile.h main.cpp tmpDir.h \
 			 testFuzzTiles.cpp testFuzzTiles.h 
 
 
-INCLUDES = -I$(top_builddir)  \
+AM_CPPFLAGS = -I$(top_builddir)  \
 	   -I$(top_srcdir)/IlmImf \
 	   -I$(top_srcdir)/config \
 	   @ILMBASE_CXXFLAGS@ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)

diff --git a/OpenEXR/IlmImfTest/Makefile.am b/OpenEXR/IlmImfTest/Makefile.am
@@ -67,7 +67,7 @@ AM_CPPFLAGS += -DENABLE_IMFHUGETEST
 endif
 
 
-INCLUDES = -I$(top_builddir)  \
+AM_CPPFLAGS = -I$(top_builddir)  \
 	   -I$(top_srcdir)/IlmImf \
 	   -I$(top_srcdir)/config \
 	   @ILMBASE_CXXFLAGS@ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)

diff --git a/OpenEXR/IlmImfUtil/Makefile.am b/OpenEXR/IlmImfUtil/Makefile.am
@@ -39,7 +39,7 @@ libIlmImfUtilincludedir = $(includedir)/OpenEXR
 
 EXTRA_DIST = CMakeLists.txt
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	   -I$(top_builddir) \
 	   -I$(top_srcdir)/IlmImf \
 	   -I$(top_srcdir)/config \

diff --git a/OpenEXR/IlmImfUtilTest/Makefile.am b/OpenEXR/IlmImfUtilTest/Makefile.am
@@ -12,7 +12,7 @@ IlmImfUtilTest_SOURCES = main.cpp \
 	testDeepImage.h testDeepImage.cpp \
 	testIO.h testIO.cpp tmpDir.h
 
-INCLUDES = -I$(top_builddir)  \
+AM_CPPFLAGS = -I$(top_builddir)  \
 	   -I$(top_srcdir)/IlmImf \
 	   -I$(top_srcdir)/IlmImfUtil \
 	   -I$(top_srcdir)/config \

diff --git a/OpenEXR/exr2aces/Makefile.am b/OpenEXR/exr2aces/Makefile.am
@@ -7,7 +7,7 @@
 
 bin_PROGRAMS = exr2aces
 
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
            -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
 	   @ILMBASE_CXXFLAGS@
 

diff --git a/OpenEXR/exrbuild/Makefile.am b/OpenEXR/exrbuild/Makefile.am
@@ -7,7 +7,7 @@
 
 bin_PROGRAMS = exrbuild
 
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
 	              -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
 		                 @ILMBASE_CXXFLAGS@
 

diff --git a/OpenEXR/exrenvmap/Makefile.am b/OpenEXR/exrenvmap/Makefile.am
@@ -7,7 +7,7 @@
 
 bin_PROGRAMS = exrenvmap
 
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
            -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
            @ILMBASE_CXXFLAGS@ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
 

diff --git a/OpenEXR/exrheader/Makefile.am b/OpenEXR/exrheader/Makefile.am
@@ -7,7 +7,7 @@
 
 bin_PROGRAMS = exrheader
 
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
            -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
            @ILMBASE_CXXFLAGS@ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
 

diff --git a/OpenEXR/exrmakepreview/Makefile.am b/OpenEXR/exrmakepreview/Makefile.am
@@ -7,7 +7,7 @@
 
 bin_PROGRAMS = exrmakepreview
 
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
            -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
            @ILMBASE_CXXFLAGS@ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
 

diff --git a/OpenEXR/exrmaketiled/Makefile.am b/OpenEXR/exrmaketiled/Makefile.am
@@ -7,7 +7,7 @@
 
 bin_PROGRAMS = exrmaketiled
 
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
            -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
            @ILMBASE_CXXFLAGS@ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
 

diff --git a/OpenEXR/exrmultipart/Makefile.am b/OpenEXR/exrmultipart/Makefile.am
@@ -7,7 +7,7 @@
 
 bin_PROGRAMS = exrmultipart
 
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
 -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
 @ILMBASE_CXXFLAGS@ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
 

diff --git a/OpenEXR/exrmultiview/Makefile.am b/OpenEXR/exrmultiview/Makefile.am
@@ -7,7 +7,7 @@
 
 bin_PROGRAMS = exrmultiview
 
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
            -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
            @ILMBASE_CXXFLAGS@ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
 

diff --git a/OpenEXR/exrstdattr/Makefile.am b/OpenEXR/exrstdattr/Makefile.am
@@ -7,7 +7,7 @@
 
 bin_PROGRAMS = exrstdattr
 
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
            -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
            @ILMBASE_CXXFLAGS@ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
 

diff --git a/OpenEXR_Viewers/exrdisplay/Makefile.am b/OpenEXR_Viewers/exrdisplay/Makefile.am
@@ -9,7 +9,7 @@ if HAVE_FLTK
 
 bin_PROGRAMS = exrdisplay
 
-INCLUDES = @OPENEXR_CXXFLAGS@ \
+AM_CPPFLAGS = @OPENEXR_CXXFLAGS@ \
         @GL_CXXFLAGS@ @CG_CXXFLAGS@ @FLTK_CXXFLAGS@ -I$(top_builddir) \
 	@OPENEXR_CTL_CXXFLAGS@
 

diff --git a/OpenEXR_Viewers/playexr/Makefile.am b/OpenEXR_Viewers/playexr/Makefile.am
@@ -11,7 +11,7 @@ bin_PROGRAMS = playexr
 
 playexr_CPPFLAGS = $(AM_CPPFLAGS) 
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	@OPENEXR_CTL_CXXFLAGS@ \
 	@GL_CXXFLAGS@ \
 	@CG_CXXFLAGS@

diff --git a/PyIlmBase/PyIex/Makefile.am b/PyIlmBase/PyIex/Makefile.am
@@ -23,6 +23,6 @@ iexmodule_la_LIBADD  = libPyIex.la @BOOST_PYTHON_LIBS@
 
 noinst_HEADERS = 
 
-INCLUDES = @ILMBASE_CXXFLAGS@ \
+AM_CPPFLAGS = @ILMBASE_CXXFLAGS@ \
 	   -I$(top_builddir)  \
 	   -I$(top_srcdir)/config
diff --git a/PyIlmBase/PyImath/Makefile.am b/PyIlmBase/PyImath/Makefile.am
@@ -92,7 +92,7 @@ imathmodule_la_LIBADD  = -lPyImath @BOOST_PYTHON_LIBS@
 noinst_HEADERS = PyImathFun.h \
     PyImathBasicTypes.h 
 
-INCLUDES = @ILMBASE_CXXFLAGS@ \
+AM_CPPFLAGS = @ILMBASE_CXXFLAGS@ \
 	   -I$(top_builddir)  \
 	   -I$(top_srcdir)/PyIex  \
 	   -I$(top_srcdir)/config
diff --git a/PyIlmBase/PyImathNumpy/Makefile.am b/PyIlmBase/PyImathNumpy/Makefile.am
@@ -13,7 +13,7 @@ imathnumpymodule_la_LIBADD  = $(top_builddir)/PyImath/libPyImath.la @BOOST_PYTHO
 
 noinst_HEADERS = 
 
-INCLUDES = @ILMBASE_CXXFLAGS@      \
+AP_CPPFLAGS = @ILMBASE_CXXFLAGS@      \
            @NUMPY_CXXFLAGS@        \
            -I$(top_srcdir)/PyImath \
 	       -I$(top_builddir)       \