vte r2172 - in trunk: . src

[chpe svn gnome org]

Author: chpe
Date: Sat Nov 22 13:45:23 2008
New Revision: 2172
URL: http://svn.gnome.org/viewvc/vte?rev=2172&view=rev

Log:
	* src/Makefile.am: Separate CFLAGS and CPPFLAGS.

Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sat Nov 22 13:45:23 2008
@@ -39,13 +39,6 @@
 #	gperf vteseq-n.gperf -g -a -S 4 -t -m 100 -C -P -l -H vteseq_n_hash -N vteseq_n_lookup -Q vteseq_n_stringpool > $@
 
 
-AM_CFLAGS = $(VTE_CFLAGS) $(PCRE_CFLAGS) \
-	    -DG_DISABLE_ASSERT -DG_LOG_DOMAIN=\"Vte\"
-AM_CPPFLAGS = -DDATADIR='"$(datadir)"' \
-	      -DLIBEXECDIR='"$(libexecdir)"' \
-	      -DLOCALEDIR='"$(localedir)"' \
-	      -DVTE_COMPILATION
-
 EXTRA_libvte_la_SOURCES = keysyms.c
 
 libvte_la_SOURCES = \
@@ -103,11 +96,19 @@
 	vtetypebuiltins.h \
 	vteversion.h
 
+libvte_la_CPPFLAGS = \
+	-DG_DISABLE_ASSERT \
+	-DG_LOG_DOMAIN=\"Vte\" \
+ 	-DDATADIR='"$(datadir)"' \
+	-DLIBEXECDIR='"$(libexecdir)"' \
+	-DLOCALEDIR='"$(localedir)"' \
+	-DVTE_COMPILATION
+libvte_la_CFLAGS = $(VTE_CFLAGS) $(PCRE_CFLAGS)
+libvte_la_LIBADD = $(VTE_LIBS) $(PCRE_LIBS)
 libvte_la_LDFLAGS = \
 	-version-info $(LIBVTE_LTVERSION) \
 	-export-symbols-regex "^vte_terminal_.*|^_vte_pty_.*|^vte_reaper_.*|_vte_debug_.*" \
 	@LIBTOOL_EXPORT_OPTIONS@ @LIBTOOL_FLAGS@
-libvte_la_LIBADD = $(VTE_LIBS) $(PCRE_LIBS)
 
 BUILT_SOURCES = marshal.c marshal.h vtetypebuiltins.c vtetypebuiltins.h
 CLEANFILES = marshal.c marshal.h vtetypebuiltins.c vtetypebuiltins.h stamp-vtetypebuiltins.h
@@ -131,17 +132,19 @@
 
 vte_SOURCES = \
 	vteapp.c
+vte_CFLAGS = $(VTE_CFLAGS)
 vte_LDADD = libvte.la $(VTE_LIBS)
 
-reflect_text_view_CFLAGS = -DUSE_TEXT_VIEW $(VTE_CFLAGS)
+reflect_text_view_CPPFLAGS = -DUSE_TEXT_VIEW
+reflect_text_view_CFLAGS = $(VTE_CFLAGS)
 reflect_text_view_SOURCES = reflect.c
 reflect_text_view_LDADD = $(VTE_LIBS)
 
-reflect_vte_CFLAGS = -DUSE_VTE $(VTE_CFLAGS)
+reflect_vte_CPPFLAGS = -DUSE_VTE
+reflect_vte_CFLAGS = $(VTE_CFLAGS)
 reflect_vte_SOURCES = reflect.c
 reflect_vte_LDADD = libvte.la $(VTE_LIBS)
 
-interpret_CFLAGS = $(GTK_CFLAGS) -DINTERPRET_MAIN
 interpret_SOURCES = \
 	buffer.c \
 	buffer.h \
@@ -164,9 +167,12 @@
 	vtetree.c \
 	vtetree.h \
 	interpret.c
-interpret_LDADD = $(GOBJECT_LIBS)
+interpret_CPPFLAGS = \
+ 	-DINTERPRET_MAIN \
+ 	-DDATADIR='"$(datadir)"'
+interpret_CFLAGS = $(GTK_CFLAGS)
+interpret_LDADD = $(GTK_LIBS)
 
-iso2022_CFLAGS = $(GTK_CFLAGS) -DISO2022_MAIN
 iso2022_SOURCES = \
 	buffer.c \
 	buffer.h \
@@ -188,9 +194,10 @@
 	vtetc.h \
 	vtetree.c \
 	vtetree.h
-iso2022_LDADD = $(GOBJECT_LIBS)
+iso2022_CPPFLAGS = -DISO2022_MAIN
+iso2022_CFLAGS = $(GTK_CFLAGS)
+iso2022_LDADD = $(GTK_LIBS)
 
-utf8echo_CFLAGS = $(GOBJECT_CFLAGS) -DUTF8ECHO_MAIN
 utf8echo_SOURCES = \
 	buffer.c \
 	buffer.h \
@@ -209,26 +216,30 @@
 	vteconv.h \
 	vtetc.c \
 	vtetc.h
+utf8echo_CPPFLAGS = -DUTF8ECHO_MAIN
+utf8echo_CFLAGS = $(GOBJECT_CFLAGS)
 utf8echo_LDADD = $(GOBJECT_LIBS)
 
-nativeecho_CFLAGS = $(GLIB_CFLAGS) -DNATIVEECHO_MAIN
 nativeecho_SOURCES = \
 	nativeecho.c
+nativeecho_CPPFLAGS = -DNATIVEECHO_MAIN
+nativeecho_CFLAGS = $(GLIB_CFLAGS)
 nativeecho_LDADD = $(GLIB_LIBS)
 
-ring_CFLAGS = $(GLIB_CFLAGS) -DRING_MAIN
 ring_SOURCES = \
 	debug.c \
 	debug.h \
 	ring.c \
 	ring.h
+ring_CPPFLAGS = -DRING_MAIN
+ring_CFLAGS = $(GLIB_CFLAGS)
 ring_LDADD = $(GLIB_LIBS)
 
 slowcat_SOURCES = \
 	slowcat.c
+slowcat_CFLAGS = $(GLIB_CFLAGS)
 slowcat_LDADD = $(GLIB_LIBS)
 
-table_CFLAGS = $(GOBJECT_CFLAGS) -DTABLE_MAIN
 table_SOURCES = \
 	buffer.c \
 	buffer.h \
@@ -246,9 +257,10 @@
 	vteconv.h \
 	vtetc.c \
 	vtetc.h
+table_CPPFLAGS = -DTABLE_MAIN
+table_CFLAGS = $(GOBJECT_CFLAGS)
 table_LDADD = $(GOBJECT_LIBS)
 
-trie_CFLAGS = $(GOBJECT_CFLAGS) -DTRIE_MAIN
 trie_SOURCES = \
 	buffer.c \
 	buffer.h \
@@ -266,25 +278,28 @@
 	vteconv.h \
 	vtetc.c \
 	vtetc.h 
+trie_CPPFLAGS = -DTRIE_MAIN
+trie_CFLAGS = $(GOBJECT_CFLAGS)
 trie_LDADD = $(GOBJECT_LIBS)
 
-vtetc_CFLAGS = $(GLIB_CFLAGS) -DTERMCAP_MAIN
 vtetc_SOURCES = \
 	debug.c \
 	debug.h \
 	vtetc.c \
 	vtetc.h
+vtetc_CPPFLAGS = -DTERMCAP_MAIN
+vtetc_CFLAGS = $(GLIB_CFLAGS)
 vtetc_LDADD = $(GLIB_LIBS)
 
-pty_CFLAGS = $(GLIB_CFLAGS) -DPTY_MAIN
 pty_SOURCES = \
 	debug.c \
 	debug.h \
 	pty.c \
 	pty.h
+pty_CPPFLAGS = -DPTY_MAIN -DLIBEXECDIR='"$(libexecdir)"'
+pty_CFLAGS = $(GLIB_CFLAGS)
 pty_LDADD = $(GLIB_LIBS)
 
-reaper_CFLAGS = $(GTK_CFLAGS) -DREAPER_MAIN
 reaper_SOURCES = \
 	debug.c \
 	debug.h \
@@ -292,9 +307,10 @@
 	marshal.h \
 	reaper.c \
 	reaper.h
+reaper_CPPFLAGS =  -DREAPER_MAIN -DLOCALEDIR='"$(localedir)"'
+reaper_CFLAGS = $(GOBJECT_CFLAGS)
 reaper_LDADD = $(GOBJECT_LIBS)
 
-vteconv_CFLAGS = $(GLIB_CFLAGS) -DVTECONV_MAIN
 vteconv_SOURCES = \
 	buffer.c \
 	buffer.h \
@@ -302,23 +318,27 @@
 	debug.h \
 	vteconv.c \
 	vteconv.h
+vteconv_CPPFLAGS = -DVTECONV_MAIN
+vteconv_CFLAGS = $(GLIB_CFLAGS)
 vteconv_LDADD = $(GLIB_LIBS)
 
-buffer_CFLAGS = $(GLIB_CFLAGS) -DBUFFER_MAIN
 buffer_SOURCES = buffer.c
+buffer_CPPFLAGS = -DBUFFER_MAIN
+buffer_CFLAGS = $(GLIB_CFLAGS)
 buffer_LDADD = $(GLIB_LIBS)
 
 dumpkeys_SOURCES = dumpkeys.c
+dumpkeys_CFLAGS = $(GLIB_CFLAGS)
 dumpkeys_LDADD = $(GLIB_LIBS)
 
 mev_SOURCES = mev.c
+mev_CFLAGS = $(GLIB_CFLAGS)
 mev_LDADD = $(GLIB_LIBS)
 
 ssfe_SOURCES = ssfe.c
-ssfe_LDADD =
 
-xticker_CFLAGS = $(GLIB_CFLAGS)
 xticker_SOURCES = xticker.c
+xticker_CFLAGS = $(GLIB_CFLAGS)
 xticker_LDADD = $(GLIB_LIBS)
 
 vteseq-table.h: vteseq-gen.c vteseq-list.h