Bug 344666 – Problems with *_CFLAGS and *_LDFLAGS in makefiles Patch

2006-06-12  Behdad Esfahbod  <behdad@gnome.org>

        Bug 344666 – Problems with *_CFLAGS and *_LDFLAGS in makefiles
        Patch from Stepan Kasal <kasal@ucw.cz>.

        * src/Makefile.am (AM_CFLAGS, AM_LDFLAGS, *_CFLAGS, *_LDADD):
        Replace @FOO@ references by $(FOO), remove redundant (or buggy)
        occurences of `@CFLAGS@'.
        * gnome-pty-helper/Makefile.am (AM_CFLAGS, AM_LDFLAGS): Likewise.
        * python/Makefile.am (vtemodule_la_CFLAGS): Likewise.
        * src/Makefile.am (AM_CFLAGS): Add $(FT2_CFLAGS).

5 files changed, 61 insertions, 49 deletions

diff --git a/ChangeLog b/ChangeLog
index 2413578b..2c404092 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-06-12  Behdad Esfahbod  <behdad@gnome.org>
+
+	Bug 344666 – Problems with *_CFLAGS and *_LDFLAGS in makefiles
+	Patch from Stepan Kasal <kasal@ucw.cz>.
+
+	* src/Makefile.am (AM_CFLAGS, AM_LDFLAGS, *_CFLAGS, *_LDADD):
+	Replace @FOO@ references by $(FOO), remove redundant (or buggy)
+	occurences of `@CFLAGS@'.
+	* gnome-pty-helper/Makefile.am (AM_CFLAGS, AM_LDFLAGS): Likewise.
+	* python/Makefile.am (vtemodule_la_CFLAGS): Likewise.
+	* src/Makefile.am (AM_CFLAGS): Add $(FT2_CFLAGS).
+
 2006-06-08  Behdad Esfahbod  <behdad@gnome.org>
 
 	* src/vte.c (remove_display_timeout): Fix typo which may have been
diff --git a/gnome-pty-helper/Makefile.am b/gnome-pty-helper/Makefile.am
index 9c9dc48b..9dea1cd2 100644
--- a/gnome-pty-helper/Makefile.am
+++ b/gnome-pty-helper/Makefile.am
@@ -1,7 +1,7 @@
 libexec_PROGRAMS = gnome-pty-helper
 
-AM_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
-AM_LDFLAGS = @LDFLAGS@ @GLIB_LIBS@
+AM_CFLAGS = $(GLIB_CFLAGS)
+AM_LDFLAGS = $(LDFLAGS) $(GLIB_LIBS)
 
 gnome_pty_helper_SOURCES = \
 	gnome-pty.h \
diff --git a/python/Makefile.am b/python/Makefile.am
index c18d1800..e8baf8f5 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -8,9 +8,9 @@ pythonsiteexec_LTLIBRARIES = $(PYTHON_MODULES)
 
 CLEANFILES = vte.c
 
-vtemodule_la_CFLAGS = @VTE_CFLAGS@ @X_CFLAGS@ @PYTHON_INCLUDES@ @PYGTK_CFLAGS@
+vtemodule_la_CFLAGS = $(VTE_CFLAGS) $(X_CFLAGS) $(PYTHON_INCLUDES) $(PYGTK_CFLAGS)
 vtemodule_la_SOURCES = vtemodule.c
-vtemodule_la_LIBADD = $(top_builddir)/src/libvte.la @LIBS@ @PYGTK_LIBS@ @VTE_LIBS@ @X_LIBS@
+vtemodule_la_LIBADD = $(top_builddir)/src/libvte.la $(LIBS) $(PYGTK_LIBS) $(VTE_LIBS) $(X_LIBS)
 vtemodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex initvte
 nodist_vtemodule_la_SOURCES = vte.c
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 87f75c05..9738597d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,8 +21,8 @@ EXTRA_DIST = \
 	unitable.JIS0212 \
 	unitable.KSX1001
 
-AM_CFLAGS = @VTE_CFLAGS@ @CFLAGS@ @X_CFLAGS@ -DG_DISABLE_ASSERT
-AM_LDFLAGS = @LDFLAGS@
+AM_CFLAGS = $(VTE_CFLAGS) $(FT2_CFLAGS) $(X_CFLAGS) -DG_DISABLE_ASSERT
+AM_LDFLAGS = $(LDFLAGS)
 
 EXTRA_libvte_la_SOURCES = keysyms.c
 
@@ -104,11 +104,11 @@ VERSION_CURRENT=9
 # AGE must be incremented when an API or ABI addition is made, and REVISION
 # must be reset to 0 when this happens.
 VERSION_AGE=0
-libvte_la_LDFLAGS = @LDFLAGS@ \
+libvte_la_LDFLAGS = $(LDFLAGS) \
 	-version-info $(VERSION_CURRENT):$(VERSION_REVISION):$(VERSION_AGE) \
 	-export-symbols-regex "^vte_terminal_.*|^_vte_pty_.*|^vte_reaper_.*" \
 	-no-undefined
-libvte_la_LIBADD = @LIBS@ @VTE_LIBS@ @X_LIBS@
+libvte_la_LIBADD = $(LIBS) $(VTE_LIBS) $(X_LIBS)
 
 CLEANFILES = marshal.c marshal.h
 
@@ -118,17 +118,17 @@ marshal.c marshal.h: marshal.list
 
 vte_SOURCES = \
 	vteapp.c
-vte_LDADD = libvte.la @LDFLAGS@ @LIBS@ @VTE_LIBS@ @X_LIBS@
+vte_LDADD = libvte.la $(LDFLAGS) $(LIBS) $(VTE_LIBS) $(X_LIBS)
 
-reflect_text_view_CFLAGS = @CFLAGS@ -DUSE_TEXT_VIEW @VTE_CFLAGS@ @X_CFLAGS@
+reflect_text_view_CFLAGS = -DUSE_TEXT_VIEW $(VTE_CFLAGS) $(X_CFLAGS)
 reflect_text_view_SOURCES = reflect.c
-reflect_text_view_LDADD = @LDFLAGS@ @LIBS@ @VTE_LIBS@ @X_LIBS@
+reflect_text_view_LDADD = $(LDFLAGS) $(LIBS) $(VTE_LIBS) $(X_LIBS)
 
-reflect_vte_CFLAGS = @CFLAGS@ -DUSE_VTE @VTE_CFLAGS@ @X_CFLAGS@
+reflect_vte_CFLAGS = -DUSE_VTE $(VTE_CFLAGS) $(X_CFLAGS)
 reflect_vte_SOURCES = reflect.c
-reflect_vte_LDADD = libvte.la @LDFLAGS@ @LIBS@ @VTE_LIBS@ @X_LIBS@
+reflect_vte_LDADD = libvte.la $(LDFLAGS) $(LIBS) $(VTE_LIBS) $(X_LIBS)
 
-interpret_CFLAGS = @CFLAGS@ @GTK_CFLAGS@ -DINTERPRET_MAIN
+interpret_CFLAGS = $(GTK_CFLAGS) -DINTERPRET_MAIN
 interpret_SOURCES = \
 	buffer.c \
 	buffer.h \
@@ -149,9 +149,9 @@ interpret_SOURCES = \
 	vtetc.c \
 	vtetc.h \
 	interpret.c
-interpret_LDADD = @LDFLAGS@ @GOBJECT_LIBS@
+interpret_LDADD = $(LDFLAGS) $(GOBJECT_LIBS)
 
-iso2022_CFLAGS = @CFLAGS@ @GTK_CFLAGS@ -DISO2022_MAIN
+iso2022_CFLAGS = $(GTK_CFLAGS) -DISO2022_MAIN
 iso2022_SOURCES = \
 	buffer.c \
 	buffer.h \
@@ -171,9 +171,9 @@ iso2022_SOURCES = \
 	vteconv.h \
 	vtetc.c \
 	vtetc.h
-iso2022_LDADD = @LDFLAGS@ @LIBS@ @GOBJECT_LIBS@
+iso2022_LDADD = $(LDFLAGS) $(LIBS) $(GOBJECT_LIBS)
 
-utf8echo_CFLAGS = @CFLAGS@ @GOBJECT_CFLAGS@ -DUTF8ECHO_MAIN
+utf8echo_CFLAGS = $(GOBJECT_CFLAGS) -DUTF8ECHO_MAIN
 utf8echo_SOURCES = \
 	buffer.c \
 	buffer.h \
@@ -192,26 +192,26 @@ utf8echo_SOURCES = \
 	vteconv.h \
 	vtetc.c \
 	vtetc.h
-utf8echo_LDADD = @LDFLAGS@ @LIBS@ @GOBJECT_LIBS@
+utf8echo_LDADD = $(LDFLAGS) $(LIBS) $(GOBJECT_LIBS)
 
-nativeecho_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ -DNATIVEECHO_MAIN
+nativeecho_CFLAGS = $(GLIB_CFLAGS) -DNATIVEECHO_MAIN
 nativeecho_SOURCES = \
 	nativeecho.c
-nativeecho_LDADD = @LDFLAGS@ @LIBS@ @GLIB_LIBS@
+nativeecho_LDADD = $(LDFLAGS) $(LIBS) $(GLIB_LIBS)
 
-ring_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ -DRING_MAIN
+ring_CFLAGS = $(GLIB_CFLAGS) -DRING_MAIN
 ring_SOURCES = \
 	debug.c \
 	debug.h \
 	ring.c \
 	ring.h
-ring_LDADD = @LDFLAGS@ @LIBS@ @GLIB_LIBS@
+ring_LDADD = $(LDFLAGS) $(LIBS) $(GLIB_LIBS)
 
 slowcat_SOURCES = \
 	slowcat.c
-slowcat_LDADD = @LDFLAGS@ @LIBS@ @GLIB_LIBS@
+slowcat_LDADD = $(LDFLAGS) $(LIBS) $(GLIB_LIBS)
 
-table_CFLAGS = @CFLAGS@ @GOBJECT_CFLAGS@ -DTABLE_MAIN
+table_CFLAGS = $(GOBJECT_CFLAGS) -DTABLE_MAIN
 table_SOURCES = \
 	buffer.c \
 	buffer.h \
@@ -229,9 +229,9 @@ table_SOURCES = \
 	vteconv.h \
 	vtetc.c \
 	vtetc.h
-table_LDADD = @LDFLAGS@ @LIBS@ @GOBJECT_LIBS@
+table_LDADD = $(LDFLAGS) $(LIBS) $(GOBJECT_LIBS)
 
-trie_CFLAGS = @CFLAGS@ @GOBJECT_CFLAGS@ -DTRIE_MAIN
+trie_CFLAGS = $(GOBJECT_CFLAGS) -DTRIE_MAIN
 trie_SOURCES = \
 	buffer.c \
 	buffer.h \
@@ -249,25 +249,25 @@ trie_SOURCES = \
 	vteconv.h \
 	vtetc.c \
 	vtetc.h 
-trie_LDADD = @LDFLAGS@ @LIBS@ @GOBJECT_LIBS@
+trie_LDADD = $(LDFLAGS) $(LIBS) $(GOBJECT_LIBS)
 
-vtetc_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ -DTERMCAP_MAIN
+vtetc_CFLAGS = $(GLIB_CFLAGS) -DTERMCAP_MAIN
 vtetc_SOURCES = \
 	debug.c \
 	debug.h \
 	vtetc.c \
 	vtetc.h
-vtetc_LDADD = @LDFLAGS@ @LIBS@ @GLIB_LIBS@
+vtetc_LDADD = $(LDFLAGS) $(LIBS) $(GLIB_LIBS)
 
-pty_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ -DPTY_MAIN
+pty_CFLAGS = $(GLIB_CFLAGS) -DPTY_MAIN
 pty_SOURCES = \
 	debug.c \
 	debug.h \
 	pty.c \
 	pty.h
-pty_LDADD = @LDFLAGS@ @LIBS@ @GLIB_LIBS@
+pty_LDADD = $(LDFLAGS) $(LIBS) $(GLIB_LIBS)
 
-reaper_CFLAGS = @CFLAGS@ @GTK_CFLAGS@ -DREAPER_MAIN
+reaper_CFLAGS = $(GTK_CFLAGS) -DREAPER_MAIN
 reaper_SOURCES = \
 	debug.c \
 	debug.h \
@@ -275,13 +275,13 @@ reaper_SOURCES = \
 	marshal.h \
 	reaper.c \
 	reaper.h
-reaper_LDADD = @LDFLAGS@ @LIBS@ @GOBJECT_LIBS@
+reaper_LDADD = $(LDFLAGS) $(LIBS) $(GOBJECT_LIBS)
 
-vterdb_CFLAGS = @CFLAGS@ @GTK_CFLAGS@ -DVTERDB_MAIN
+vterdb_CFLAGS = $(GTK_CFLAGS) -DVTERDB_MAIN
 vterdb_SOURCES = vterdb.c
-vterdb_LDADD = @LDFLAGS@ @LIBS@ @GTK_LIBS@
+vterdb_LDADD = $(LDFLAGS) $(LIBS) $(GTK_LIBS)
 
-vteconv_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ -DVTECONV_MAIN
+vteconv_CFLAGS = $(GLIB_CFLAGS) -DVTECONV_MAIN
 vteconv_SOURCES = \
 	buffer.c \
 	buffer.h \
@@ -289,24 +289,24 @@ vteconv_SOURCES = \
 	debug.h \
 	vteconv.c \
 	vteconv.h
-vteconv_LDADD = @LDFLAGS@ @GLIB_LIBS@
+vteconv_LDADD = $(LDFLAGS) $(GLIB_LIBS)
 
-buffer_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ -DBUFFER_MAIN
+buffer_CFLAGS = $(GLIB_CFLAGS) -DBUFFER_MAIN
 buffer_SOURCES = buffer.c
-buffer_LDADD = @LDFLAGS@ @GLIB_LIBS@
+buffer_LDADD = $(LDFLAGS) $(GLIB_LIBS)
 
 dumpkeys_SOURCES = dumpkeys.c
-dumpkeys_LDADD = @LDFLAGS@ @LIBS@ @GLIB_LIBS@
+dumpkeys_LDADD = $(LDFLAGS) $(LIBS) $(GLIB_LIBS)
 
 mev_SOURCES = mev.c
-mev_LDADD = @LDFLAGS@ @LIBS@ @GLIB_LIBS@
+mev_LDADD = $(LDFLAGS) $(LIBS) $(GLIB_LIBS)
 
 ssfe_SOURCES = ssfe.c
-ssfe_LDADD = @LDFLAGS@ @OTHERLIBS@
+ssfe_LDADD = $(LDFLAGS) $(OTHERLIBS)
 
-xticker_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
+xticker_CFLAGS = $(GLIB_CFLAGS)
 xticker_SOURCES = xticker.c
-xticker_LDADD = @LDFLAGS@ @LIBS@ @GLIB_LIBS@
+xticker_LDADD = $(LDFLAGS) $(LIBS) $(GLIB_LIBS)
 
 vteseq-table.h: vteseq-gen.c vteseq-list.h
 	$(MAKE) vteseq-gen
diff --git a/termcaps/Makefile.am b/termcaps/Makefile.am
index 6cdc0525..fe54682e 100644
--- a/termcaps/Makefile.am
+++ b/termcaps/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = xterm xterm.baseline
 termcapdir = $(pkgdatadir)/termcap
-termcap_DATA = xterm @VTE_DEFAULT_EMULATION@
-@VTE_DEFAULT_EMULATION@: xterm
-	sed -e s,^xterm:,@VTE_DEFAULT_EMULATION@:,g \
-	    -e s,^xterm\|,@VTE_DEFAULT_EMULATION@\|,g $< > $@
+termcap_DATA = xterm $(VTE_DEFAULT_EMULATION)
+$(VTE_DEFAULT_EMULATION): xterm
+	sed -e s,^xterm:,$(VTE_DEFAULT_EMULATION):,g \
+	    -e s,^xterm\|,$(VTE_DEFAULT_EMULATION)\|,g $< > $@