1 diff -Nur libxml2-2.6.17.orig/Makefile.am libxml2-2.6.17/Makefile.am
2 --- libxml2-2.6.17.orig/Makefile.am 2005-01-11 10:17:08.000000000 +0100
3 +++ libxml2-2.6.17/Makefile.am 2005-01-18 12:10:48.763861240 +0100
6 DIST_SUBDIRS = include . doc example python xstc
8 -INCLUDES = -I$(top_builddir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@
9 +INCLUDES = -I$(top_builddir)/include -I$(srcdir)/include $(THREAD_CFLAGS) $(Z_CFLAGS)
11 noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
12 testThreads testC14N testAutomata testRegexp \
14 bin_SCRIPTS=xml2-config
16 lib_LTLIBRARIES = libxml2.la
17 -libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@
18 +libxml2_la_LIBADD = $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)
21 LIBXML2_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxml2.syms
23 LIBXML2_VERSION_SCRIPT =
26 -libxml2_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ \
27 +libxml2_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) \
28 $(LIBXML2_VERSION_SCRIPT) \
29 - -version-info @LIBXML_VERSION_INFO@ \
30 - @MODULE_PLATFORM_LIBS@
31 + -version-info $(LIBXML_VERSION_INFO) \
32 + $(MODULE_PLATFORM_LIBS)
35 libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c \
39 DEPS = $(top_builddir)/libxml2.la
40 -LDADDS = @STATIC_BINARIES@ $(top_builddir)/libxml2.la @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@
41 +LDADDS = $(STATIC_BINARIES) $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)
44 man_MANS = xml2-config.1 libxml.3
46 xmllint_SOURCES=xmllint.c
48 xmllint_DEPENDENCIES = $(DEPS)
49 -xmllint_LDADD= @RDL_LIBS@ $(LDADDS)
50 +xmllint_LDADD= $(RDL_LIBS) libxml2.la
52 testSAX_SOURCES=testSAX.c
56 CLEANFILES=xml2Conf.sh
58 -confexecdir=$(libdir)
59 -confexec_DATA = xml2Conf.sh
61 EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \
62 libxml.m4 Copyright check-xml-test-suite.py gentest.py \
63 diff -Nur libxml2-2.6.17.orig/include/libxml/Makefile.am libxml2-2.6.17/include/libxml/Makefile.am
64 --- libxml2-2.6.17.orig/include/libxml/Makefile.am 2005-01-04 15:55:45.000000000 +0100
65 +++ libxml2-2.6.17/include/libxml/Makefile.am 2005-01-18 12:08:45.978527448 +0100
71 - $(mkinstalldirs) $(DESTDIR)$(xmlincdir)
73 EXTRA_DIST = xmlversion.h.in