libxml2 r3696 - in trunk: . python python/tests

[veillard svn gnome org]

Author: veillard
Date: Tue Feb 19 07:54:52 2008
New Revision: 3696
URL: http://svn.gnome.org/viewvc/libxml2?rev=3696&view=rev

Log:
* python/Makefile.am python/tests/Makefile.am: applied cleanup
  patches for cross compilation and MinGW from Roumen Petrov
Daniel


Modified:
   trunk/ChangeLog
   trunk/python/Makefile.am
   trunk/python/tests/Makefile.am

Modified: trunk/python/Makefile.am
==============================================================================
--- trunk/python/Makefile.am	(original)
+++ trunk/python/Makefile.am	Tue Feb 19 07:54:52 2008
@@ -9,21 +9,17 @@
 	-I$(top_builddir)/include \
 	-I$(top_builddir)/$(subdir)
 
-DOCS_DIR = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)
+docsdir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)
 # libxml2class.txt is generated
-DOCS = ${srcdir}/TODO
+dist_docs_DATA = TODO
 
 EXTRA_DIST = 			\
-	libxml.c		\
-	types.c			\
 	setup.py		\
 	setup.py.in		\
 	generator.py		\
 	libxml_wrap.h		\
 	libxml.py		\
-	drv_libxml2.py		\
-	libxml2-python-api.xml	\
-	$(DOCS)
+	libxml2-python-api.xml
 
 libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -avoid-version 
 
@@ -31,29 +27,23 @@
 mylibs = \
 	$(top_builddir)/libxml2.la
 
-all-local:	libxml2.py
-
 python_LTLIBRARIES = libxml2mod.la
 
-libxml2mod_la_SOURCES = libxml.c types.c libxml2-py.c
+libxml2mod_la_SOURCES = libxml.c types.c
+nodist_libxml2mod_la_SOURCES = libxml2-py.c
 libxml2mod_la_LIBADD = $(mylibs) @CYGWIN_EXTRA_PYTHON_LIBADD@
 
+libxml.c: libxml2-py.h # to generate before to compile
+
+
 libxml2.py: $(srcdir)/libxml.py libxml2class.py
-	cat $(srcdir)/libxml.py libxml2class.py > libxml2.py
+	cat $(srcdir)/libxml.py libxml2class.py > $@
+
+python_DATA = \
+	libxml2.py
 
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(pythondir)
-	@INSTALL@ -m 0644 libxml2.py $(DESTDIR)$(pythondir)
-	@INSTALL@ -m 0644 $(srcdir)/drv_libxml2.py $(DESTDIR)$(pythondir)
-	$(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
-	@(for doc in $(DOCS) ; \
-	   do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done)
-
-uninstall-local:
-	@(for doc in $(DOCS) ; \
-	   do rm $(DESTDIR)$(DOCS_DIR)/`basename $$doc` ; done)
-	rm $(DESTDIR)$(pythondir)/drv_libxml2.py
-	rm $(DESTDIR)$(pythondir)/libxml2.py
+dist_python_DATA = \
+	drv_libxml2.py
 	
 GENERATE = generator.py
 API_DESC = $(top_srcdir)/doc/libxml2-api.xml $(srcdir)/libxml2-python-api.xml
@@ -70,12 +60,8 @@
 gen_prog: $(srcdir)/$(GENERATE) $(API_DESC)
 	$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
 	touch gen_prog
-
-$(libxml2mod_la_OBJECTS): $(GENERATED)
-
-else
-all: 
 endif
+
 tests test: all
 	cd tests && $(MAKE) MAKEFLAGS+=--silent tests
 

Modified: trunk/python/tests/Makefile.am
==============================================================================
--- trunk/python/tests/Makefile.am	(original)
+++ trunk/python/tests/Makefile.am	Tue Feb 19 07:54:52 2008
@@ -1,4 +1,5 @@
-EXAMPLE_DIR = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples
+exampledir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples
+dist_example_DATA = $(PYTESTS) $(XMLS)
 
 PYTESTS=	\
     build.py	\
@@ -52,8 +53,6 @@
     invalid.xml	\
     test.dtd
 
-EXTRA_DIST = $(PYTESTS) $(XMLS)
-
 if WITH_PYTHON
 tests: $(PYTESTS)
 	@echo "## running Python regression tests"
@@ -71,13 +70,3 @@
 
 clean:
 	rm -f *.pyc core
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(EXAMPLE_DIR)
-	-(for test in $(PYTESTS) $(XMLS); \
-	  do @INSTALL@ -m 0644 $(srcdir)/$$test $(DESTDIR)$(EXAMPLE_DIR) ; done)
-
-uninstall-local:
-	@(for test in $(PYTESTS) $(XMLS) ; \
-	   do rm $(DESTDIR)$(EXAMPLE_DIR)/`basename $$test` ; done)
-