gamin r335 - in trunk: . python

[veillard svn gnome org]

Author: veillard
Date: Mon Oct 20 15:37:46 2008
New Revision: 335
URL: http://svn.gnome.org/viewvc/gamin?rev=335&view=rev

Log:
* Makefile.am configure.in python/Makefile.am: simplify python
  bindings installation, patch from RÃmi Cardona #530635
daniel


Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in
   trunk/python/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Mon Oct 20 15:37:46 2008
@@ -1,10 +1,14 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = lib libgamin server @PYTHON_SUBDIR@ tests doc
+SUBDIRS = lib libgamin server tests doc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gamin.pc
 
+if WITH_PYTHON
+SUBDIRS += python
+endif
+
 #if BUILD_DOCS
 #install-data-local:
 #	-doxygen

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Oct 20 15:37:46 2008
@@ -490,15 +490,12 @@
 AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
 if test "$PYTHON_INCLUDES" != ""
 then
-    PYTHON_SUBDIR=python
+    enable_python="yes"
 else
-    PYTHON_SUBDIR=
+    enable_python="no"
 fi
 AC_SUBST(pythondir)
-AC_SUBST(PYTHON_SUBDIR)
-AC_SUBST(pythondir)
 AC_SUBST(PYTHON_VERSION)
-AC_SUBST(PYTHON_SUBDIR)
 AC_SUBST(PYTHON_INCLUDES)
 AC_SUBST(PYTHON_SITE_PACKAGES)
 

Modified: trunk/python/Makefile.am
==============================================================================
--- trunk/python/Makefile.am	(original)
+++ trunk/python/Makefile.am	Mon Oct 20 15:37:46 2008
@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS = 1.4 foreign
 
 SUBDIRS=tests
 
@@ -8,33 +7,16 @@
 	-I$(top_srcdir)/libgamin\
 	-I$(top_srcdir)/lib
 
-EXTRA_DIST =			\
-	gamin.c			\
-	gamin.py
-
-_gamin_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/libgamin/.libs
-
-if WITH_PYTHON
-mylibs =			\
-	$(top_builddir)/libgamin/libgamin-1.la
-
-all-local: gamin.py
-
 python_LTLIBRARIES = _gamin.la
 
 _gamin_la_SOURCES = gamin.c
-_gamin_la_LIBADD = $(mylibs) 
+_gamin_la_LIBADD = $(top_builddir)/libgamin/libgamin-1.la
+_gamin_la_LDFLAGS = -module -avoid-version
+
+python_PYTHON = gamin.py
 
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(pythondir)
-	@INSTALL@ -m 0644 $(srcdir)/gamin.py $(DESTDIR)$(pythondir)
 
 test:
 	@(cd tests ; make tests)
 
 tests: test
-
-else
-all:
-endif
-