libbtctl r134 - in trunk: . src

[hadess svn gnome org]

Author: hadess
Date: Thu Aug 28 15:33:12 2008
New Revision: 134
URL: http://svn.gnome.org/viewvc/libbtctl?rev=134&view=rev

Log:
2008-08-28  Bastien Nocera  <hadess hadess net>

	* src/Makefile.am: Patch from Diego PettenÃ
	<flameeyes gentoo org> to fix make -jX
	(Closes: #549688)



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

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu Aug 28 15:33:12 2008
@@ -37,27 +37,27 @@
 	libbtctl.la \
 	$(BTCTL_LIBS) $(BLUETOOTH_LIBS) $(OPENOBEX_LIBS)
 
-btctl_async_test_LDFLAGS= \
+btctl_async_test_LDADD = \
 	libbtctl.la  $(BTCTL_LIBS) \
 	$(BLUETOOTH_LIBS) $(OPENOBEX_LIBS)
 
-btobexclient_test_LDFLAGS= \
+btobexclient_test_LDADD = \
 	libbtctl.la  $(BTCTL_LIBS) \
 	$(BLUETOOTH_LIBS) $(OPENOBEX_LIBS)
 
-btobex_test_LDFLAGS= \
+btobex_test_LDADD = \
 	libbtctl.la  $(BTCTL_LIBS) \
 	$(BLUETOOTH_LIBS) $(OPENOBEX_LIBS)
 
-btctl_discovery_test_LDFLAGS= \
+btctl_discovery_test_LDADD = \
 	libbtctl.la  $(BTCTL_LIBS) \
 	$(BLUETOOTH_LIBS) $(OPENOBEX_LIBS)
 
-btlist_LDFLAGS = \
+btlist_LDADD = \
 	libbtctl.la  $(BTCTL_LIBS) \
 	$(BLUETOOTH_LIBS) $(OPENOBEX_LIBS)
 
-btsignal_watch_LDFLAGS = \
+btsignal_watch_LDADD = \
 	libbtctl.la $(BTCTL_LIBS) \
 	$(BLUETOOTH_LIBS) $(OPENOBEX_LIBS)
 
@@ -80,7 +80,8 @@
 	btobex-client.h btctl-types.h
 
 libbtctl_la_LDFLAGS = \
-	-version-info $(BTCTL_LT_VERSION) \
+	-version-info $(BTCTL_LT_VERSION)
+libbtctl_la_LIBADD = \
 	$(BTCTL_LIBS) $(BLUETOOTH_LIBS) $(OPENOBEX_LIBS)
 
 
@@ -123,6 +124,7 @@
 
 btctl_la_SOURCES = btctl-py.c btctl-pymodule.c
 btctl_la_LIBADD = libbtctl.la
-btctl_la_LDFLAGS = $(BTCTLPY_LIBS) -module -avoid-version
+btctl_la_LDFLAGS = -module -avoid-version
+btctl_la_LIBADD = $(BTCTLPY_LIBS)
 endif