[gnome-bluetooth] lib: Update LIBGNOMEBT requirements



commit c6fee4db421732e603a2303c3c979c7100f397d5
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Dec 16 12:02:44 2011 +0000

    lib: Update LIBGNOMEBT requirements
    
    To list all the publicly visible libraries as dependencies. That
    includes gmodule (needed by the wizard plugins code) and GIO (used
    by the async code in the private bits of libgnome-bluetooth)

 applet/Makefile-lib.am |    2 +-
 configure.ac           |   11 ++---------
 lib/Makefile.am        |    1 -
 3 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/applet/Makefile-lib.am b/applet/Makefile-lib.am
index 67702b8..5da9c8f 100644
--- a/applet/Makefile-lib.am
+++ b/applet/Makefile-lib.am
@@ -11,7 +11,7 @@ libgnome_bluetooth_applet_la_LIBADD = $(LIBGNOMEBT_LIBS) $(top_builddir)/lib/lib
 
 libgnome_bluetooth_applet_la_LDFLAGS = -no-undefined
 
-AM_CFLAGS = -I$(srcdir) -I$(top_srcdir)/lib $(LIBGNOMEBT_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
+AM_CFLAGS = -I$(srcdir) -I$(top_srcdir)/lib $(LIBGNOMEBT_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
 
 include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
diff --git a/configure.ac b/configure.ac
index 1be22fb..316af6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,17 +123,10 @@ PKG_CHECK_MODULES(INPUT,
 		  gtk+-3.0)
 
 dnl Requires for the public library
-PKG_CHECK_MODULES(LIBGNOMEBT, gtk+-3.0)
-
-dnl Requires for the private library
-PKG_CHECK_MODULES(COMMON,
-		  gmodule-2.0
-		  gio-unix-2.0
-		  gtk+-3.0)
+PKG_CHECK_MODULES(LIBGNOMEBT, gmodule-2.0 gio-unix-2.0 gtk+-3.0)
 
 dnl Requires for the geoclue plugin
-PKG_CHECK_MODULES(GEOCLUE,
-		  gio-2.0)
+PKG_CHECK_MODULES(GEOCLUE, gio-2.0 gtk+-3.0)
 
 dnl Requires for the plugins
 PKG_CHECK_MODULES(PLUGINS,
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 2af12f5..c56c877 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -59,7 +59,6 @@ gnomebluetooth_HEADERS =				\
 AM_CFLAGS =						\
 	-I$(srcdir)					\
 	$(LIBGNOMEBT_CFLAGS)				\
-	$(COMMON_CFLAGS)				\
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED)				\
 	-DPLUGINDIR=\"$(libdir)/gnome-bluetooth/plugins\" \



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