1 diff -urN libxml2-2.5.10.orig/Makefile.am libxml2-2.5.10/Makefile.am
2 --- libxml2-2.5.10.orig/Makefile.am Fri Aug 15 15:03:34 2003
3 +++ libxml2-2.5.10/Makefile.am Fri Aug 15 15:06:34 2003
6 DIST_SUBDIRS = include . doc example python
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 testDocbook 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)
20 -libxml2_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -version-info @LIBXML_VERSION_INFO@
21 +libxml2_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -version-info $(LIBXML_VERSION_INFO)
24 libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c \
28 DEPS = $(top_builddir)/libxml2.la
29 -LDADDS = @STATIC_BINARIES@ $(top_builddir)/libxml2.la @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@
30 +LDADDS = $(STATIC_BINARIES) $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)
33 man_MANS = xml2-config.1 libxml.3
35 xmllint_SOURCES=xmllint.c
37 xmllint_DEPENDENCIES = $(DEPS)
38 -xmllint_LDADD= @RDL_LIBS@ $(LDADDS)
39 +xmllint_LDADD= $(RDL_LIBS) libxml2.la
41 testSAX_SOURCES=testSAX.c
45 CLEANFILES=xml2Conf.sh
47 -confexecdir=$(libdir)
48 -confexec_DATA = xml2Conf.sh
50 EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \
51 libxml.m4 Copyright check-xml-test-suite.py \
52 diff -urN libxml2-2.5.10.orig/include/libxml/Makefile.am libxml2-2.5.10/include/libxml/Makefile.am
53 --- libxml2-2.5.10.orig/include/libxml/Makefile.am Fri Aug 15 15:03:34 2003
54 +++ libxml2-2.5.10/include/libxml/Makefile.am Fri Aug 15 15:04:18 2003
60 - $(mkinstalldirs) $(DESTDIR)$(xmlincdir)
62 EXTRA_DIST = xmlversion.h.in