[maemo-commits] [maemo-commits] r13394 - in projects/haf/branches/hildon-control-panel/refactoring: . debian

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-08-24 14:07:51 +0300 (Fri, 24 Aug 2007)
New Revision: 13394

Modified:
   projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
   projects/haf/branches/hildon-control-panel/refactoring/debian/control
   projects/haf/branches/hildon-control-panel/refactoring/debian/rules
Log:
Use maemo-launcher pkg-config info on package build.


Modified: projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2007-08-24 10:53:51 UTC (rev 13393)
+++ projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2007-08-24 11:07:51 UTC (rev 13394)
@@ -1,4 +1,4 @@
-2007-08-10  Lucas Rocha  <lucas.rocha at nokia.com>
+2007-08-24  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hcp-window.c (hcp_window_quit): save state before closing
 	control panel in order to restore the last focused applet.

Modified: projects/haf/branches/hildon-control-panel/refactoring/debian/control
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/debian/control	2007-08-24 10:53:51 UTC (rev 13393)
+++ projects/haf/branches/hildon-control-panel/refactoring/debian/control	2007-08-24 11:07:51 UTC (rev 13394)
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Lucas Rocha <lucas.rocha at nokia.com>
-Build-Depends: debhelper (>= 4.0.0), libosso-gnomevfs2-dev, libhildon1-dev (>= 0.9.9), pkg-config, libosso-dev (>= 1.5), osso-af-settings, libhildonhelp-dev 
+Build-Depends: debhelper (>= 4.0.0), libosso-gnomevfs2-dev, libhildon1-dev (>= 0.9.9), pkg-config, libosso-dev (>= 1.5), osso-af-settings, libhildonhelp-dev, maemo-launcher-dev (>= 0.22-1)
 Standards-Version: 3.6.0
 
 Package: hildon-control-panel

Modified: projects/haf/branches/hildon-control-panel/refactoring/debian/rules
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/debian/rules	2007-08-24 10:53:51 UTC (rev 13393)
+++ projects/haf/branches/hildon-control-panel/refactoring/debian/rules	2007-08-24 11:07:51 UTC (rev 13394)
@@ -15,14 +15,11 @@
 
 CFLAGS = -Wall -g
 
-ifneq (,$(findstring maemo-launcher,$(DEB_BUILD_OPTIONS)))
-    LAUNCHER = yes
-endif
-
-ifeq "$(strip $(LAUNCHER))" "yes"
-    LAUNCHER_DEPENDS = -Vlauncher:Depends="maemo-launcher"
-    LAUNCHER_CFLAGS = -shared
-    LAUNCHER_LDFLAGS = -shared -export-dynamic
+ifeq (,$(findstring nolauncher,$(DEB_BUILD_OPTIONS)))
+	LAUNCHER = yes
+	LAUNCHER_DEPENDS = -Vlauncher:Depends="maemo-launcher"
+	LAUNCHER_CFLAGS = $(shell pkg-config --cflags maemo-launcher-app)
+	LAUNCHER_LDFLAGS = $(shell pkg-config --libs maemo-launcher-app)
 endif 
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))