[maemo-commits] [maemo-commits] r8992 - in projects/haf/branches/maemo-af-desktop/python-hildon-desktop: . pythonloader

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-01-09 11:51:32 +0200 (Tue, 09 Jan 2007)
New Revision: 8992

Modified:
   projects/haf/branches/maemo-af-desktop/python-hildon-desktop/ChangeLog
   projects/haf/branches/maemo-af-desktop/python-hildon-desktop/Makefile.am
   projects/haf/branches/maemo-af-desktop/python-hildon-desktop/configure.ac
   projects/haf/branches/maemo-af-desktop/python-hildon-desktop/pythonloader/Makefile.am
Log:
2007-01-09  Lucas Rocha  <lucas.rocha at nokia.com>

	* configure.ac: rename some vars for consistency.
	* Makefile.am: add pythonloader to SUBDIRS.
	* pythonloader/Makefile.am: install plugin loader in
	${prefix}/lib/hildon-desktop/loaders.


Modified: projects/haf/branches/maemo-af-desktop/python-hildon-desktop/ChangeLog
===================================================================
--- projects/haf/branches/maemo-af-desktop/python-hildon-desktop/ChangeLog	2007-01-09 09:43:04 UTC (rev 8991)
+++ projects/haf/branches/maemo-af-desktop/python-hildon-desktop/ChangeLog	2007-01-09 09:51:32 UTC (rev 8992)
@@ -1,3 +1,10 @@
+2007-01-09  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* configure.ac: rename some vars for consistency.
+	* Makefile.am: add pythonloader to SUBDIRS.
+	* pythonloader/Makefile.am: install plugin loader in
+	${prefix}/lib/hildon-desktop/loaders.
+
 2007-01-08  Moises Martinez <moises.martinez at nokia.com>
 
 	* configure.ac: Added pythonloader

Modified: projects/haf/branches/maemo-af-desktop/python-hildon-desktop/Makefile.am
===================================================================
--- projects/haf/branches/maemo-af-desktop/python-hildon-desktop/Makefile.am	2007-01-09 09:43:04 UTC (rev 8991)
+++ projects/haf/branches/maemo-af-desktop/python-hildon-desktop/Makefile.am	2007-01-09 09:51:32 UTC (rev 8992)
@@ -1,4 +1,4 @@
-SUBDIRS = libhildondesktop 
+SUBDIRS = libhildondesktop pythonloader
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = python-hildon-desktop.pc

Modified: projects/haf/branches/maemo-af-desktop/python-hildon-desktop/configure.ac
===================================================================
--- projects/haf/branches/maemo-af-desktop/python-hildon-desktop/configure.ac	2007-01-09 09:43:04 UTC (rev 8991)
+++ projects/haf/branches/maemo-af-desktop/python-hildon-desktop/configure.ac	2007-01-09 09:51:32 UTC (rev 8992)
@@ -36,11 +36,11 @@
 hildondesktopincludedir=`pkg-config libhildondesktop --variable=includedir`
 AC_SUBST(hildondesktopincludedir)
 
-hildonpluginloaderpathlib=`pkg-config hildon-desktop --variable=hildonpluginloaderpathlib`
-AC_SUBST(hildonpluginloaderpathlib)
+hildonpluginloaderlibdir=`pkg-config hildon-desktop --variable=hildonpluginloaderlibdir`
+AC_SUBST(hildonpluginloaderlibdir)
 
-#FIXME
-hildondesktoplibdir=$(libdir)/hildon-desktop
+hildondesktoplibdir=`pkg-config hildon-desktop --variable=hildondesktoplibdir`
+AC_SUBST(hildondesktoplibdir)
 
 #++++++++
 # Python

Modified: projects/haf/branches/maemo-af-desktop/python-hildon-desktop/pythonloader/Makefile.am
===================================================================
--- projects/haf/branches/maemo-af-desktop/python-hildon-desktop/pythonloader/Makefile.am	2007-01-09 09:43:04 UTC (rev 8991)
+++ projects/haf/branches/maemo-af-desktop/python-hildon-desktop/pythonloader/Makefile.am	2007-01-09 09:51:32 UTC (rev 8992)
@@ -1,26 +1,24 @@
 EXTRA_DIST = .empty
 
-INCLUDES = \
-	$(HILDONDESKTOP_CFLAGS) \
+hildonpluginloaderlib_LTLIBRARIES = libpythonpluginloader.la
+
+libpythonpluginloader_la_LIBADD = \
+	$(LIBHILDONDESKTOP_LIBS)  \
+	$(PYTHON_LIB_LOC)         \
+	$(PYTHON_LIBS)            \
+	$(PYGTK_LIBS)             \
+	$(PYGOBJECT_LIBS)
+
+libpythonpluginloader_la_CFLAGS =  \
+	$(HILDONDESKTOP_CFLAGS)    \
    	$(LIBHILDONDESKTOP_CFLAGS) \
-	$(PYTHON_CFLAGS) \
-	$(PYGTK_CFLAGS) \
-	$(PYGOBJECT_CFLAGS) \
+	$(PYTHON_CFLAGS)           \
+	$(PYGTK_CFLAGS)            \
+	$(PYGOBJECT_CFLAGS)        \
 	-DHD_DESKTOP_MODULE_PATH=\"$(hildondesktoplibdir)\"
 
-lib_LTLIBRARIES = libpythonpluginloader.la
-
 libpythonpluginloader_la_SOURCES = \
-	hd-plugin-loader-python.c \
+	hd-plugin-loader-python.c  \
 	hd-plugin-loader-python.h
 
-libpythonpluginloader_la_LIBADD = \
-	$(LIBHILDONDESKTOP_LIBS) \
-	$(PYTHON_LIB_LOC) \
-	$(PYTHON_LIBS) \
-	$(PYGTK_LIBS) \
-	$(PYGOBJECT_LIBS)
-
-libpythonpluginloaderlibinstdir=$(hildonpluginloaderpathlib)
-
 CLEANFILES = *~