[maemo-commits] [maemo-commits] r12746 - in projects/haf/trunk/libosso: . debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-07-16 16:50:30 +0300 (Mon, 16 Jul 2007)
New Revision: 12746

Modified:
   projects/haf/trunk/libosso/configure
   projects/haf/trunk/libosso/configure.ac
   projects/haf/trunk/libosso/debian/changelog
   projects/haf/trunk/libosso/src/Makefile.am
   projects/haf/trunk/libosso/src/Makefile.in
Log:
added MCE_CFLAGS/LIBS


Modified: projects/haf/trunk/libosso/configure
===================================================================
--- projects/haf/trunk/libosso/configure	2007-07-16 13:38:43 UTC (rev 12745)
+++ projects/haf/trunk/libosso/configure	2007-07-16 13:50:30 UTC (rev 12746)
@@ -20631,6 +20631,8 @@
   fi
 
 
+
+
 # Checks for header files.
 echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6

Modified: projects/haf/trunk/libosso/configure.ac
===================================================================
--- projects/haf/trunk/libosso/configure.ac	2007-07-16 13:38:43 UTC (rev 12745)
+++ projects/haf/trunk/libosso/configure.ac	2007-07-16 13:50:30 UTC (rev 12746)
@@ -157,6 +157,8 @@
 AM_CONDITIONAL([BUILD_UNIT_TESTS], [test "x${build_unit_tests}" = "xyes"])
 
 PKG_CHECK_MODULES([MCE], [mce >= 1.5])
+AC_SUBST([MCE_LIBS])
+AC_SUBST([MCE_CFLAGS])
 
 # Checks for header files.
 AC_HEADER_STDC

Modified: projects/haf/trunk/libosso/debian/changelog
===================================================================
--- projects/haf/trunk/libosso/debian/changelog	2007-07-16 13:38:43 UTC (rev 12745)
+++ projects/haf/trunk/libosso/debian/changelog	2007-07-16 13:50:30 UTC (rev 12746)
@@ -2,6 +2,7 @@
 
   * Added some thread safety.
   * Removed -Werror from compilation options.
+  * Added MCE_CFLAGS and MCE_LIBS to Makefile.am.
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 16 Jul 2007 15:17:41 +0300
 

Modified: projects/haf/trunk/libosso/src/Makefile.am
===================================================================
--- projects/haf/trunk/libosso/src/Makefile.am	2007-07-16 13:38:43 UTC (rev 12745)
+++ projects/haf/trunk/libosso/src/Makefile.am	2007-07-16 13:50:30 UTC (rev 12746)
@@ -1,4 +1,4 @@
-AM_CFLAGS = $(OSSO_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
+AM_CFLAGS = $(MCE_CFLAGS) $(OSSO_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
 	    -I$(top_srcdir) -I$(top_srcdir)/src
 
 AM_CPPFLAGS = \
@@ -7,7 +7,8 @@
 
 lib_LTLIBRARIES = libosso.la
 
-libosso_la_LIBADD = -ldl -lc $(GTHREAD_LIBS) $(GLIB_LIBS) $(DBUS_LIBS)
+libosso_la_LIBADD = -ldl -lc $(MCE_LIBS) $(GTHREAD_LIBS) $(GLIB_LIBS) \
+		    $(DBUS_LIBS)
 libosso_la_LDFLAGS = -version-info 4:0:3
 
 ossoincludedir=$(includedir)

Modified: projects/haf/trunk/libosso/src/Makefile.in
===================================================================
--- projects/haf/trunk/libosso/src/Makefile.in	2007-07-16 13:38:43 UTC (rev 12745)
+++ projects/haf/trunk/libosso/src/Makefile.in	2007-07-16 13:50:30 UTC (rev 12746)
@@ -53,7 +53,7 @@
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libosso_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libosso_la_OBJECTS = osso-state.lo osso-init.lo \
 	osso-application-top.lo osso-application-autosave.lo \
 	osso-hw.lo osso-mime.lo osso-system-note.lo osso-rpc.lo \
@@ -215,7 +215,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AM_CFLAGS = $(OSSO_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
+AM_CFLAGS = $(MCE_CFLAGS) $(OSSO_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
 	    -I$(top_srcdir) -I$(top_srcdir)/src
 
 AM_CPPFLAGS = \
@@ -223,7 +223,9 @@
 	-DOSSO_CTRLPANELPLUGINDIR=\"${prefix}/lib/hildon-control-panel\"
 
 lib_LTLIBRARIES = libosso.la
-libosso_la_LIBADD = -ldl -lc $(GTHREAD_LIBS) $(GLIB_LIBS) $(DBUS_LIBS)
+libosso_la_LIBADD = -ldl -lc $(MCE_LIBS) $(GTHREAD_LIBS) $(GLIB_LIBS) \
+		    $(DBUS_LIBS)
+
 libosso_la_LDFLAGS = -version-info 4:0:3
 ossoincludedir = $(includedir)
 ossoinclude_HEADERS = libosso.h osso-log.h log-functions.h osso-mem.h muali.h