[gnome-control-center] Link against libxml where appropriate



commit 2083f0a045d488b5d7efef8ee3a80eacd6a3d101
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Oct 7 12:54:28 2010 -0400

    Link against libxml where appropriate
    
    The default-applications and background capplets use libxml,
    so link against it.

 configure.ac                            |    1 +
 panels/background/Makefile.am           |    9 +++++++--
 panels/default-applications/Makefile.am |    7 +++++--
 3 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b895eff..b359d89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,6 +132,7 @@ PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
 PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-3.0)
 PKG_CHECK_MODULES(GSD_DBUS, gnome-settings-daemon)
 PKG_CHECK_MODULES(GIO, gio-2.0)
+PKG_CHECK_MODULES(XML, libxml-2.0)
 
 gtk_lib_dir=`$PKG_CONFIG --variable libdir gtk+-3.0`
 gtk_binary_version=`$PKG_CONFIG --variable gtk_binary_version gtk+-3.0`
diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
index 77e0c50..8f6aaea 100644
--- a/panels/background/Makefile.am
+++ b/panels/background/Makefile.am
@@ -10,7 +10,7 @@ dist_ui_DATA = \
 
 INCLUDES =						\
 	$(PANEL_CFLAGS)					\
-	$(GNOMECC_CAPPLETS_CFLAGS)			\
+	$(XML_CFLAGS)					\
 	$(GNOME_DESKTOP_CFLAGS)				\
 	$(DBUS_CFLAGS)					\
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
@@ -38,7 +38,12 @@ libbackground_la_SOURCES =		\
 	gnome-wp-info.h  gnome-wp-item.h  gnome-wp-xml.h
 
 
-libbackground_la_LIBADD = $(PANEL_LIBS) $(DBUS_LIBS) $(GNOME_DESKTOP_LIBS)
+libbackground_la_LIBADD = \
+	$(PANEL_LIBS) \
+	$(DBUS_LIBS) \
+	$(GNOME_DESKTOP_LIBS) \
+	$(XML_LIBS)
+
 libbackground_la_LDFLAGS = $(PANEL_LDFLAGS)
 
 if WITH_LIBSOCIALWEB
diff --git a/panels/default-applications/Makefile.am b/panels/default-applications/Makefile.am
index 95412d7..543de24 100644
--- a/panels/default-applications/Makefile.am
+++ b/panels/default-applications/Makefile.am
@@ -11,7 +11,10 @@ libdefault_applications_la_SOURCES = \
 	gnome-da-xml.c gnome-da-xml.h \
 	gnome-da-item.c gnome-da-item.h
 
-libdefault_applications_la_LIBADD = $(PANEL_LIBS)
+libdefault_applications_la_LIBADD = \
+	$(PANEL_LIBS) \
+	$(XML_LIBS)
+
 libdefault_applications_la_LDFLAGS = $(PANEL_LDFLAGS)
 
 bin_SCRIPTS = gnome-at-visual gnome-at-mobility
@@ -45,7 +48,7 @@ xmldata_DATA = $(xmldata_in_files:.xml.in=.xml)
 
 INCLUDES   = 					\
 	$(GNOMECC_CAPPLETS_CFLAGS)		\
-	$(DEFAULT_APPLICATIONS_CAPPLET_CFLAGS)	\
+	$(XML_CFLAGS)				\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"\
 	-DGNOMECC_UI_DIR=\""$(uidir)"\"		\
 	-DGNOMECC_APPS_DIR=\""$(xmldatadir)"\"



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