[maemo-commits] [maemo-commits] r17060 - in projects/haf/trunk/hildon-control-panel: . src

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2009-01-08 14:46:37 +0200 (Thu, 08 Jan 2009)
New Revision: 17060

Modified:
   projects/haf/trunk/hildon-control-panel/configure.ac
   projects/haf/trunk/hildon-control-panel/src/Makefile.am
Log:
Simplified deps list

Modified: projects/haf/trunk/hildon-control-panel/configure.ac
===================================================================
--- projects/haf/trunk/hildon-control-panel/configure.ac	2009-01-08 09:11:23 UTC (rev 17059)
+++ projects/haf/trunk/hildon-control-panel/configure.ac	2009-01-08 12:46:37 UTC (rev 17060)
@@ -59,30 +59,16 @@
 AC_SUBST(hildondesktopentrydir)
 AC_SUBST(localedir)
 
-PKG_CHECK_MODULES(OSSO,libosso >= 0.10.0)
-AC_SUBST(OSSO_LIBS)
-AC_SUBST(OSSO_CFLAGS)
+PKG_CHECK_MODULES(HCP_DEPS
+	[
+	libosso >= 0.10.0
+	hildon-1
+	gnome-vfs-2.0 >= 2.8.3
+	hildon-help
+	gconf-2.0 >= 2.6.2
+	codelockui >= 1.5.6
+	])
 
-PKG_CHECK_MODULES(HILDON, hildon-1)
-AC_SUBST(HILDON_LIBS)
-AC_SUBST(HILDON_CFLAGS)
-
-PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0 >= 2.8.3)
-AC_SUBST(GNOME_VFS_LIBS)
-AC_SUBST(GNOME_VFS_CFLAGS)
-
-PKG_CHECK_MODULES(HILDON_HELP, hildon-help)
-AC_SUBST(HILDON_HELP_LIBS)
-AC_SUBST(HILDON_HELP_CFLAGS)
-
-PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.6.2)
-AC_SUBST(GCONF_LIBS)
-AC_SUBST(GCONF_CFLAGS)
-
-PKG_CHECK_MODULES(CODELOCKUI, codelockui >= 1.5.6)
-AC_SUBST(CODELOCKUI_LIBS)
-AC_SUBST(CODELOCKUI_CFLAGS)
-
 hildoncpdesktopentrydir=${datadir}/applications/hildon-control-panel
 hildoncplibdir=${libdir}/hildon-control-panel
 

Modified: projects/haf/trunk/hildon-control-panel/src/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-control-panel/src/Makefile.am	2009-01-08 09:11:23 UTC (rev 17059)
+++ projects/haf/trunk/hildon-control-panel/src/Makefile.am	2009-01-08 12:46:37 UTC (rev 17060)
@@ -20,13 +20,8 @@
 #
 
 INCLUDES = \
-	$(HILDON_CFLAGS) \
 	$(MAEMO_LAUNCHER_CFLAGS) \
-	$(OSSO_CFLAGS)\
-	$(HILDON_HELP_CFLAGS) \
-	$(GCONF_CFLAGS) \
-	$(GNOME_VFS_CFLAGS) \
-	$(CODELOCKUI_CFLAGS)\
+	$(HCP_DEPS_CFLAGS) \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DPREFIXDIR=\"$(prefix)\" \
 	-DCONTROLPANEL_ENTRY_DIR=\"$(hildoncpdesktopentrydir)\" \
@@ -70,12 +65,7 @@
 controlpanel_LDFLAGS = $(MAEMO_LAUNCHER_LDFLAGS)
 
 controlpanel_LDADD = \
-	$(HILDON_LIBS) \
-	$(OSSO_LIBS) \
-	$(HILDON_HELP_LIBS) \
-	$(GCONF_LIBS) \
-	$(GNOME_VFS_LIBS) \
-	$(CODELOCKUI_LIBS)
+	$(HCP_DEPS_LIBS)
 
 hildon_cp_pluginincludeinstdir=$(includedir)/hildon-cp-plugin
 hildon_cp_pluginincludeinst_DATA = hildon-cp-plugin-interface.h