* itcl/Makefile.in (ITCL_CFLAGS): Renamed from CFLAGS.

	(COMPILE): Use ITCL_CFLAGS in addition to CFLAGS.
	* itk/Makefile.in (ITK_CFLAGS): Renamed from CFLAGS.
	(COMPILE): Use ITK_CFLAGS in addition to CFLAGS.

diff --git a/itcl/ChangeLog b/itcl/ChangeLog
index 37ce209..8245a3a 100644 (file)
--- a/itcl/ChangeLog
+++ b/itcl/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-02  Kevin Buettner  <kevinb@redhat.com>
+
+       * itcl/Makefile.in (ITCL_CFLAGS): Renamed from CFLAGS.
+       (COMPILE): Use ITCL_CFLAGS in addition to CFLAGS.
+       * itk/Makefile.in (ITK_CFLAGS): Renamed from CFLAGS.
+       (COMPILE): Use ITK_CFLAGS in addition to CFLAGS.
+
 2008-08-02  Keith Seitz  <keiths@redhat.com>
 
        * itk/configure.ac: Add missing bits to actually fill in

diff --git a/itcl/itcl/Makefile.in b/itcl/itcl/Makefile.in
index 5adc780..6963412 100644 (file)
--- a/itcl/itcl/Makefile.in
+++ b/itcl/itcl/Makefile.in
@@ -145,8 +145,8 @@ CONFIG_CLEAN_FILES = @CONFIG_CLEAN_FILES@ Makefile itclConfig.sh pkgIndex.tcl
 CPPFLAGS       = @CPPFLAGS@
 LIBS           = @PKG_LIBS@ @LIBS@
 AR             = @AR@
-CFLAGS         = @CFLAGS@
-COMPILE                = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ITCL_CFLAGS    = @CFLAGS@
+COMPILE                = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ITCL_CFLAGS)
 
 #========================================================================
 # Start of user-definable TARGETS section

diff --git a/itcl/itk/Makefile.in b/itcl/itk/Makefile.in
index e33fd0f..0e80961 100644 (file)
--- a/itcl/itk/Makefile.in
+++ b/itcl/itk/Makefile.in
@@ -170,8 +170,8 @@ CONFIG_CLEAN_FILES = @CONFIG_CLEAN_FILES@ Makefile itkConfig.sh pkgIndex.tcl
 CPPFLAGS       = @CPPFLAGS@
 LIBS           = @PKG_LIBS@ @LIBS@
 AR             = @AR@
-CFLAGS         = @CFLAGS@
-COMPILE                = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ITK_CFLAGS     = @CFLAGS@
+COMPILE                = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ITK_CFLAGS)
 
 #========================================================================
 # Start of user-definable TARGETS section