]>
Commit | Line | Data |
---|---|---|
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 | |
4 | @@ -4,7 +4,7 @@ | |
5 | ||
6 | DIST_SUBDIRS = include . doc example python xstc | |
7 | ||
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) | |
10 | ||
11 | noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \ | |
12 | testThreads testC14N testAutomata testRegexp \ | |
13 | @@ -15,9 +15,9 @@ | |
14 | bin_SCRIPTS=xml2-config | |
15 | ||
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) | |
19 | ||
20 | -libxml2_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -version-info @LIBXML_VERSION_INFO@ @MODULE_PLATFORM_LIBS@ | |
21 | +libxml2_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -version-info $(LIBXML_VERSION_INFO) $(MODULE_PLATFORM_LIBS) | |
22 | ||
23 | if WITH_TRIO_SOURCES | |
24 | libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c \ | |
25 | @@ -41,7 +41,7 @@ | |
26 | endif | |
27 | ||
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) | |
31 | ||
32 | ||
33 | man_MANS = xml2-config.1 libxml.3 | |
34 | @@ -52,7 +52,7 @@ | |
35 | xmllint_SOURCES=xmllint.c | |
36 | xmllint_LDFLAGS = | |
37 | xmllint_DEPENDENCIES = $(DEPS) | |
38 | -xmllint_LDADD= @RDL_LIBS@ $(LDADDS) | |
39 | +xmllint_LDADD= $(RDL_LIBS) libxml2.la | |
40 | ||
41 | testSAX_SOURCES=testSAX.c | |
42 | testSAX_LDFLAGS = | |
43 | @@ -1031,8 +1031,6 @@ | |
44 | ||
45 | CLEANFILES=xml2Conf.sh | |
46 | ||
47 | -confexecdir=$(libdir) | |
48 | -confexec_DATA = xml2Conf.sh | |
49 | CVS_EXTRA_DIST= | |
50 | EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \ | |
51 | libxml.m4 Copyright check-xml-test-suite.py gentest.py \ | |
52 | diff -Nur libxml2-2.6.17.orig/include/libxml/Makefile.am libxml2-2.6.17/include/libxml/Makefile.am | |
53 | --- libxml2-2.6.17.orig/include/libxml/Makefile.am 2005-01-04 15:55:45.000000000 +0100 | |
54 | +++ libxml2-2.6.17/include/libxml/Makefile.am 2005-01-18 12:08:45.978527448 +0100 | |
55 | @@ -50,7 +50,4 @@ | |
56 | pattern.h \ | |
57 | xmlsave.h | |
58 | ||
59 | -install-exec-hook: | |
60 | - $(mkinstalldirs) $(DESTDIR)$(xmlincdir) | |
61 | - | |
62 | EXTRA_DIST = xmlversion.h.in |