[maemo-commits] [maemo-commits] r15430 - projects/haf/trunk/maemo-launcher

[From: subversion at stage.maemo.org]

Author: guillem
Date: 2008-04-16 01:36:04 +0300 (Wed, 16 Apr 2008)
New Revision: 15430

Modified:
   projects/haf/trunk/maemo-launcher/ChangeLog
   projects/haf/trunk/maemo-launcher/README
Log:
README: Add some documentation for make based build systems


Modified: projects/haf/trunk/maemo-launcher/ChangeLog
===================================================================
--- projects/haf/trunk/maemo-launcher/ChangeLog	2008-04-15 22:36:02 UTC (rev 15429)
+++ projects/haf/trunk/maemo-launcher/ChangeLog	2008-04-15 22:36:04 UTC (rev 15430)
@@ -1,5 +1,9 @@
 2008-04-15  Guillem Jover  <guillem.jover at nokia.com>
 
+	* README: Add some documentation for make based build systems.
+
+2008-04-15  Guillem Jover  <guillem.jover at nokia.com>
+
 	* launcher/comm_msg.h (comm_msg_set_magic): Rename to ...
 	(comm_msg_put_magic): ... this. Fix all users.
 	(comm_msg_pack_int): Rename to ...

Modified: projects/haf/trunk/maemo-launcher/README
===================================================================
--- projects/haf/trunk/maemo-launcher/README	2008-04-15 22:36:02 UTC (rev 15429)
+++ projects/haf/trunk/maemo-launcher/README	2008-04-15 22:36:04 UTC (rev 15430)
@@ -62,12 +62,14 @@
 These are the detailed changes needed to add support for the new
 maemo-launcher.
 
-The changes are meant for normal Maemo packages using automake. If yours
+The changes are meant for normal Maemo packages using automake (there's now
+some notes for make based build systems, but those might need more changes
+not documented here, as Makefiles can vary from writter to writter). If yours
 differ feel free to contact me (Guillem Jover <guillem.jover at nokia.com>)
 and I can help you on the process.
 
 
-Upstream Changes
+Upstream Changes (automake based build system)
 ----------------
 
 On configure.ac (or the deprecated configure.in) add something like:
@@ -100,6 +102,24 @@
 	$(MAEMO_LAUNCHER_LIBS)
 
 
+Upstream Changes (make based build system)
+----------------
+
+On the Makefile(s) responsible of compiling the object files and linking the
+application to be launcherized, the following can be used to obtain the
+proper flags:
+
+,----X<----
+|ifeq ($(USE_LAUNCHER),yes)
+|  application_CFLAGS := $(shell pkg-config --cflags maemo-launcher-app)
+|  application_LDFLAGS := $(shell pkg-config --libs maemo-launcher-app)
+|endif
+`----X<----
+
+Those new variables can then be added on the respective linking and compiling
+rules for the desired application in the Makefile.
+
+
 Debian Changes
 --------------
 
@@ -113,7 +133,7 @@
 * debian/rules (debhelper):
 
   - At the top of the file around other code processing DEB_BUILD_OPTIONS,
-    add:
+    for automake base build systems add:
 
 ,----X<----
 |ifeq (,$(findstring nolauncher,$(DEB_BUILD_OPTIONS)))
@@ -121,13 +141,28 @@
 |endif
 `----X<----
 
-  - On the configure call, add $(conf_opt), so that it becomes something
-    like:
+    For make based ones:
 
 ,----X<----
+|ifeq (,$(findstring nolauncher,$(DEB_BUILD_OPTIONS)))
+|       USE_LAUNCHER := yes
+|endif
+`----X<----
+
+  - To notify the upstream build system that we might want to enable the
+    launcher support, for automake based build systems on the configure
+    call, add $(conf_opt), so that it becomes something like:
+
+,----X<----
 |	./configure --enable-foo --enable-bar $(conf_opt)
 `----X<----
 
+    For make based ones:
+
+,----X<----
+|	$(MAKE) $(ARG_FOO) USE_LAUNCHER=$(USE_LAUNCHER)
+`----X<----
+
   - On the binary target producing the package with launcherized files,
     add a call to dh_maemolauncher.