From 7f585d824024afa0f5958207fa074cabce3b8f1c Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Tue, 28 Jul 2009 17:28:54 +0000 Subject: [PATCH] hopefully the last build fix --- nm-applet-internal-buildfixes.patch | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch index c29ff0f..83af25c 100644 --- a/nm-applet-internal-buildfixes.patch +++ b/nm-applet-internal-buildfixes.patch @@ -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 --- 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 = \ -DLOCALEDIR="\"$(datadir)/locale\"" \ -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) \ $(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 --- 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