------------------------------------------------------------
revno: 1530
committer: Steve Langasek <[email protected]>
branch nick: upstream
timestamp: Thu 2013-09-12 21:43:00 -0700
message:
  don't pass cflags from unrelated libraries when building, only pass them to
  those bridges which use the relevant libraries.
modified:
  ChangeLog
  extra/Makefile.am


--
lp:upstart
https://code.launchpad.net/~upstart-devel/upstart/trunk

Your team Upstart Reviewers is subscribed to branch lp:upstart.
To unsubscribe from this branch go to 
https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'ChangeLog'
--- ChangeLog	2013-09-12 23:44:17 +0000
+++ ChangeLog	2013-09-13 04:43:00 +0000
@@ -2,6 +2,9 @@
 
 	* configure.ac:
 	  - correct the copyright notice.
+	* extra/Makefile.am:
+	  - don't pass cflags from unrelated libraries when building, only
+	    pass them to those bridges which use the relevant libraries.
 
 2013-09-05  James Hunt  <[email protected]>
 

=== modified file 'extra/Makefile.am'
--- extra/Makefile.am	2013-08-15 13:37:43 +0000
+++ extra/Makefile.am	2013-09-13 04:43:00 +0000
@@ -6,9 +6,7 @@
 AM_CFLAGS = \
 	$(NIH_CFLAGS) \
 	$(NIH_DBUS_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	$(UDEV_CFLAGS) \
-	$(DCONF_CFLAGS)
+	$(DBUS_CFLAGS)
 
 AM_CPPFLAGS = \
 	-DLOCALEDIR="\"$(localedir)\"" \
@@ -128,6 +126,11 @@
 	$(DBUS_LIBS) \
 	$(GIO_LIBS) \
 	$(DCONF_LIBS)
+upstart_dconf_bridge_CFLAGS =
+	$(NIH_CFLAGS) \
+	$(NIH_DBUS_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	$(DCONF_CFLAGS)
 else
 EXTRA_DIST += \
 	upstart-dconf-bridge.c
@@ -153,7 +156,12 @@
 	$(NIH_DBUS_LIBS) \
 	$(DBUS_LIBS) \
 	$(UDEV_LIBS)
-
+upstart_udev_bridge_CFLAGS =
+	$(NIH_CFLAGS) \
+	$(NIH_DBUS_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	$(UDEV_CFLAGS)
+	
 install-data-hook:
 	src=`echo upstart-udev-bridge| sed '$(transform)'`.8; \
 	for symlink in \

-- 
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/upstart-devel

Reply via email to