shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-02-01 17:47:01 +03:00
Code

applied cleanup patches for cross compilation and MinGW from Roumen Petrov

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

svn path=/trunk/; revision=3696
This commit is contained in:
Daniel Veillard 2008-02-19 07:54:52 +00:00
parent c4ba8a4221
commit 5ac88237e1
3 changed files with 21 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Feb 19 08:49:32 CET 2008 Daniel Veillard <daniel@veillard.com>
* python/Makefile.am python/tests/Makefile.am: applied cleanup
patches for cross compilation and MinGW from Roumen Petrov
Sat Feb 16 11:06:54 CET 2008 Daniel Veillard <daniel@veillard.com>
* xmlIO.c: fix output bug reported by Petr Pajas and analyzed by

42
python/Makefile.am
View File

@ -9,21 +9,17 @@ INCLUDES = \
-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 @@ if WITH_PYTHON
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 > $@
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)
python_DATA = \
libxml2.py
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 @@ $(GENERATED): gen_prog
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

15
python/tests/Makefile.am
View File

@ -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 @@ XMLS= \
invalid.xml \
test.dtd
EXTRA_DIST = $(PYTESTS) $(XMLS)
if WITH_PYTHON
tests: $(PYTESTS)
@echo "## running Python regression tests"
@ -71,13 +70,3 @@ endif
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)