dasher r3637 - in trunk: . Src Src/Common Src/DasherCore Src/Gtk2

[pwelche svn gnome org]

Author: pwelche
Date: Mon Mar  2 17:40:24 2009
New Revision: 3637
URL: http://svn.gnome.org/viewvc/dasher?rev=3637&view=rev

Log:
In fact, AM_CPPFLAGS may be more suitable, but PKG_CHECK_MODULES only seems
to return CFLAGS - not obvious how to get pkg-config --cflags-only-I returned.


Modified:
   trunk/ChangeLog
   trunk/Src/Common/Makefile.am
   trunk/Src/DasherCore/Makefile.am
   trunk/Src/Gtk2/Makefile.am
   trunk/Src/Makefile.am

Modified: trunk/Src/Common/Makefile.am
==============================================================================
--- trunk/Src/Common/Makefile.am	(original)
+++ trunk/Src/Common/Makefile.am	Mon Mar  2 17:40:24 2009
@@ -1,4 +1,3 @@
-
 noinst_LIBRARIES = libdashermisc.a
 libdashermisc_a_SOURCES = \
                 AppSettingsData.h \
@@ -25,6 +24,6 @@
 #		IOstreamDasherEdit.cc   I have no idea what this does, but it's broken now
 #		IOstreamDasherEdit.h 
 
-AM_CXXFLAGS = $(GTK2_CFLAGS) $(SETTINGS_CFLAGS) $(gnome_speech_CFLAGS) $(gnome_a11y_CFLAGS) $(glade_CFLAGS) $(gnome_CFLAGS) $(wnck_CFLAGS) -DWNCK_I_KNOW_THIS_IS_UNSTABLE -I$(srcdir)/../DasherCore -DPROGDATA=\"$(pkgdatadir)\" -I../../intl -I$(top_srcdir)/intl 
+AM_CXXFLAGS = -I$(srcdir)/../DasherCore -DPROGDATA=\"$(pkgdatadir)\" -I../../intl -I$(top_srcdir)/intl $(GTK2_CFLAGS) $(SETTINGS_CFLAGS) $(gnome_speech_CFLAGS) $(gnome_a11y_CFLAGS) $(glade_CFLAGS) $(gnome_CFLAGS) $(wnck_CFLAGS) -DWNCK_I_KNOW_THIS_IS_UNSTABLE
 
 EXTRA_DIST = Common.vcproj Common_vc70.vcproj Common_vc71.vcproj Common_vc80.vcproj

Modified: trunk/Src/DasherCore/Makefile.am
==============================================================================
--- trunk/Src/DasherCore/Makefile.am	(original)
+++ trunk/Src/DasherCore/Makefile.am	Mon Mar  2 17:40:24 2009
@@ -142,7 +142,7 @@
 		PinyinParser.cpp \
 		PinyinParser.h
 
-AM_CXXFLAGS = $(GTK2_CFLAGS) $(SETTINGS_CFLAGS) $(gnome_speech_CFLAGS) $(gnome_a11y_CFLAGS) $(glade_CFLAGS) $(gnome_CFLAGS) $(wnck_CFLAGS) -DWNCK_I_KNOW_THIS_IS_UNSTABLE -I$(srcdir)/../DasherCore -DPROGDATA=\"$(pkgdatadir)\" -I../../intl -I$(top_srcdir)/intl 
+AM_CXXFLAGS = -I$(srcdir)/../DasherCore -DPROGDATA=\"$(pkgdatadir)\" -I../../intl -I$(top_srcdir)/intl $(GTK2_CFLAGS) $(SETTINGS_CFLAGS) $(gnome_speech_CFLAGS) $(gnome_a11y_CFLAGS) $(glade_CFLAGS) $(gnome_CFLAGS) $(wnck_CFLAGS) -DWNCK_I_KNOW_THIS_IS_UNSTABLE
 
 EXTRA_DIST = \
 		LanguageModelling/BigramLanguageModel.cpp \

Modified: trunk/Src/Gtk2/Makefile.am
==============================================================================
--- trunk/Src/Gtk2/Makefile.am	(original)
+++ trunk/Src/Gtk2/Makefile.am	Mon Mar  2 17:40:24 2009
@@ -102,6 +102,6 @@
 libdashergtk_a_LIBADD = @SPEECH_SOURCES@
 libdashergtk_a_DEPENDENCIES = @SPEECH_SOURCES@
 
-AM_CXXFLAGS = $(GTK2BUILD_CFLAGS) -I$(srcdir)/../DasherCore -DPROGDATA=\"$(pkgdatadir)\" -I../../intl -I$(top_srcdir)/intl 
+AM_CXXFLAGS = -I$(srcdir)/../DasherCore -DPROGDATA=\"$(pkgdatadir)\" -I../../intl -I$(top_srcdir)/intl $(GTK2BUILD_CFLAGS) 
 
 AM_CFLAGS = $(GTK2_CFLAGS)

Modified: trunk/Src/Makefile.am
==============================================================================
--- trunk/Src/Makefile.am	(original)
+++ trunk/Src/Makefile.am	Mon Mar  2 17:40:24 2009
@@ -12,10 +12,10 @@
 dasher_SOURCES = main.cc
 
 AM_CXXFLAGS = \
-	$(GTK2BUILD_CFLAGS) \
 	-I$(srcdir)/Gtk2 \
 	-I$(srcdir)/DasherCore \
 	-I$(top_srcdir)/intl \
+	$(GTK2BUILD_CFLAGS) \
 	-DPREFIX=\"$(PREFIX)\" \
 	-DLIBDIR=\"$(libdir)\" \
 	-DDATADIR=\"$(datadir)\" \