hopefully the last build fix

This commit is contained in:
Daniel Williams 2009-07-28 17:28:54 +00:00
parent fb480f3523
commit 7f585d8240

View File

@ -70,7 +70,7 @@ diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers
diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gnome-bluetooth/Makefile.am diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gnome-bluetooth/Makefile.am
--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400 --- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gnome-bluetooth/Makefile.am 2009-07-28 13:23:19.166718483 -0400 +++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400
@@ -6,6 +6,9 @@ INCLUDES = \ @@ -6,6 +6,9 @@ INCLUDES = \
-DLOCALEDIR="\"$(datadir)/locale\"" \ -DLOCALEDIR="\"$(datadir)/locale\"" \
-I$(top_srcdir)/src/gconf-helpers/ \ -I$(top_srcdir)/src/gconf-helpers/ \
@ -81,6 +81,19 @@ diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gnome-bluetoo
$(GNOME_BLUETOOTH_CFLAGS) \ $(GNOME_BLUETOOTH_CFLAGS) \
$(WARN_CFLAGS) $(WARN_CFLAGS)
@@ -14,7 +17,11 @@ plugin_LTLIBRARIES = libnma.la
libnma_la_SOURCES = network-manager-applet.c
libnma_la_LDFLAGS = -module -avoid-version
-libnma_la_LIBADD = $(top_builddir)/src/gconf-helpers/libgconf-helpers.la $(GNOME_BLUETOOTH_LIBS)
+libnma_la_LIBADD = \
+ $(top_builddir)/src/gconf-helpers/libgconf-helpers.la \
+ $(GNOME_BLUETOOTH_LIBS) \
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
endif
EXTRA_DIST = network-manager-applet.c
diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am
--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400 --- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400