r3170 - in trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-10-15 11:54:48 +0200 (Mon, 15 Oct 2007)
New Revision: 3170

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/Makefile.am
Log:
* configure.ac:
* src/Makefile.am:

Prevent CFLAGS from being obliterated


Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-10-15 09:07:35 UTC (rev 3169)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-10-15 09:54:48 UTC (rev 3170)
@@ -1,3 +1,10 @@
+2007-10-15  Thomas Wood  <thomas at openedhand.com>
+
+	* configure.ac:
+	* src/Makefile.am:
+
+	Prevent CFLAGS from being obliterated
+
 2007-10-12  Thomas Wood  <thomas at openedhand.com>
 
 	* src/moko-dialer-textview.c: (moko_dialer_textview_delete): Make sure

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac	2007-10-15 09:07:35 UTC (rev 3169)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/configure.ac	2007-10-15 09:54:48 UTC (rev 3170)
@@ -29,11 +29,9 @@
 	AC_DEFINE(HAVE_ECONTACT_PHOTO_TYPE, 1, [Defined if EContactPhotoType exists])
 fi
 
+AC_SUBST(DIALER_CFLAGS)
+AC_SUBST(DIALER_LIBS)
 
-LIBS="$DIALER_LIBS  -lm -ldl"
-
-CFLAGS="$DIALER_CFLAGS"
-
 dnl ==============================================
 dnl DBUS
 dnl ==============================================

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/Makefile.am	2007-10-15 09:07:35 UTC (rev 3169)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/Makefile.am	2007-10-15 09:54:48 UTC (rev 3170)
@@ -1,7 +1,3 @@
-AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \
-              -DPKGDATADIR=\"$(pkgdatadir)\"
-AM_CFLAGS = -Wall @CFLAGS@
-
 bin_PROGRAMS = openmoko-dialer
 
 openmoko_dialer_SOURCES = \
@@ -31,8 +27,11 @@
 	moko-sound.c			\
 	moko-sound.h
 
+openmoko_dialer_CPPFLAGS = -DDATADIR=\"$(datadir)\" \
+              -DPKGDATADIR=\"$(pkgdatadir)\"
+openmoko_dialer_CFLAGS = -Wall @DIALER_CFLAGS@
 
-openmoko_dialer_LDADD = @LIBS@
+openmoko_dialer_LDADD = @DIALER_LIBS@
 
 moko-dialer-glue.h: moko-dialer-dbus.xml
 	$(LIBTOOL) --mode=execute $(DBUS_GLIB_BIN)/dbus-binding-tool --prefix=moko_dialer --mode=glib-server --output=$@ $<