[maemo-commits] [maemo-commits] r14917 - in projects/haf/trunk/maemo-launcher: . client debian

[From: subversion at stage.maemo.org]

Author: guillem
Date: 2007-12-07 19:32:05 +0200 (Fri, 07 Dec 2007)
New Revision: 14917

Modified:
   projects/haf/trunk/maemo-launcher/ChangeLog
   projects/haf/trunk/maemo-launcher/client/Makefile.am
   projects/haf/trunk/maemo-launcher/debian/changelog
Log:
Use compile options determined from configure to build the client


Modified: projects/haf/trunk/maemo-launcher/ChangeLog
===================================================================
--- projects/haf/trunk/maemo-launcher/ChangeLog	2007-12-07 17:25:24 UTC (rev 14916)
+++ projects/haf/trunk/maemo-launcher/ChangeLog	2007-12-07 17:32:05 UTC (rev 14917)
@@ -1,5 +1,11 @@
 2007-12-07  Guillem Jover  <guillem.jover at nokia.com>
 
+	* client/Makefile.am (PIE): Remove variable.
+	(maemo_client_CPPFLAGS): Add $(PIC).
+	(maemo_client_LDFLAGS): Rename $(PIE) to $(PIC). Add '-shared'.
+
+2007-12-07  Guillem Jover  <guillem.jover at nokia.com>
+
 	* client/client.c: Rewrite for Hildon 1.x.
 
 2007-12-04  Guillem Jover  <guillem.jover at nokia.com>

Modified: projects/haf/trunk/maemo-launcher/client/Makefile.am
===================================================================
--- projects/haf/trunk/maemo-launcher/client/Makefile.am	2007-12-07 17:25:24 UTC (rev 14916)
+++ projects/haf/trunk/maemo-launcher/client/Makefile.am	2007-12-07 17:32:05 UTC (rev 14917)
@@ -10,14 +10,10 @@
 
 EXTRA_DIST = $(version_script)
 
-if USE_PIE
-PIE = -pie
-else
-PIE = -shared
-endif
-
 maemo_client_SOURCES = $(sources)
-maemo_client_CPPFLAGS = $(CLIENT_CFLAGS)
-maemo_client_LDFLAGS = -rdynamic -Wl,--version-script=$(version_script) $(PIE)
+maemo_client_CPPFLAGS = $(CLIENT_CFLAGS) $(PIC)
+maemo_client_LDFLAGS = \
+	-rdynamic -Wl,--version-script=$(version_script) \
+	-shared $(PIC)
 maemo_client_LDADD = $(CLIENT_LIBS)
 

Modified: projects/haf/trunk/maemo-launcher/debian/changelog
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/changelog	2007-12-07 17:25:24 UTC (rev 14916)
+++ projects/haf/trunk/maemo-launcher/debian/changelog	2007-12-07 17:32:05 UTC (rev 14917)
@@ -2,6 +2,7 @@
 
   * New Upstream Release.
     - Port client to Hildon 1.x.
+    - Use compile options determined from configure to build the client.
 
  -- Guillem Jover <guillem.jover at nokia.com>  Tue, 04 Dec 2007 20:03:29 +0200