[gnome-bluetooth] applet: Fix duplicate symbols for objects



commit 3257ce665cf60210f74b03c11b5119e7ba059415
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Nov 4 19:29:08 2011 +0000

    applet: Fix duplicate symbols for objects

 applet/Makefile-lib.am |    2 +-
 applet/Makefile.am     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/applet/Makefile-lib.am b/applet/Makefile-lib.am
index 03ddaef..67702b8 100644
--- a/applet/Makefile-lib.am
+++ b/applet/Makefile-lib.am
@@ -7,7 +7,7 @@ libgnome_bluetooth_applet_la_SOURCES = 	\
 	bluetooth-applet.c		\
 	bluetooth-applet.h
 
-libgnome_bluetooth_applet_la_LIBADD = $(LIBGNOMEBT_LIBS) $(top_builddir)/lib/libcommon.la $(top_builddir)/lib/libgnome-bluetooth.la
+libgnome_bluetooth_applet_la_LIBADD = $(LIBGNOMEBT_LIBS) $(top_builddir)/lib/libgnome-bluetooth.la
 
 libgnome_bluetooth_applet_la_LDFLAGS = -no-undefined
 
diff --git a/applet/Makefile.am b/applet/Makefile.am
index 961e19f..b931187 100644
--- a/applet/Makefile.am
+++ b/applet/Makefile.am
@@ -4,7 +4,7 @@ bin_PROGRAMS = bluetooth-applet
 
 bluetooth_applet_SOURCES = main.c notify.h notify.c agent.h agent.c
 
-bluetooth_applet_LDADD = $(top_builddir)/lib/libgnome-bluetooth.la $(builddir)/libgnome-bluetooth-applet.la $(APPLET_LIBS)
+bluetooth_applet_LDADD = $(builddir)/libgnome-bluetooth-applet.la $(APPLET_LIBS)
 
 noinst_PROGRAMS = test-agentdialog test-icon
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]