]>
Commit | Line | Data |
---|---|---|
20ab1f03 | 1 | --- libxml2-2.4.23/Makefile.am.orig Tue Jul 2 04:35:13 2002 |
2 | +++ libxml2-2.4.23/Makefile.am Tue Jul 9 23:13:35 2002 | |
c87b4ab3 | 3 | @@ -3,7 +3,7 @@ |
392ede6a | 4 | |
20ab1f03 | 5 | SUBDIRS = include . doc example python |
392ede6a | 6 | |
c87b4ab3 | 7 | -INCLUDES = -I@srcdir@/include -I$(top_builddir)/include @THREAD_CFLAGS@ @Z_CFLAGS@ |
8 | +INCLUDES = -I$(srcdir)/include -I$(top_builddir)/include $(THREAD_CFLAGS) $(Z_CFLAGS) | |
392ede6a | 9 | |
20ab1f03 | 10 | noinst_PROGRAMS=testSchemas testSAX testHTML testXPath testURI testDocbook \ |
11 | testThreads testC14N testAutomata testRegexp | |
12 | @@ -13,9 +13,9 @@ | |
392ede6a | 13 | bin_SCRIPTS=xml2-config |
14 | ||
15 | lib_LTLIBRARIES = libxml2.la | |
20ab1f03 | 16 | -libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) -lm |
17 | +libxml2_la_LIBADD = $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) -lm | |
392ede6a | 18 | |
19 | -libxml2_la_LDFLAGS = -version-info @LIBXML_VERSION_INFO@ | |
20 | +libxml2_la_LDFLAGS = -version-info $(LIBXML_VERSION_INFO) | |
21 | ||
22 | if WITH_TRIO_SOURCES | |
23 | libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c \ | |
20ab1f03 | 24 | @@ -35,7 +35,7 @@ |
392ede6a | 25 | endif |
26 | ||
27 | DEPS = $(top_builddir)/libxml2.la | |
c87b4ab3 | 28 | -LDADDS = $(top_builddir)/libxml2.la @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) -lm |
29 | +LDADDS = $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) -lm | |
392ede6a | 30 | |
20ab1f03 | 31 | man_MANS = xml2-config.1 libxml.3 |
392ede6a | 32 | |
20ab1f03 | 33 | @@ -45,7 +45,7 @@ |
392ede6a | 34 | xmllint_SOURCES=xmllint.c |
35 | xmllint_LDFLAGS = | |
36 | xmllint_DEPENDENCIES = $(DEPS) | |
37 | -xmllint_LDADD= @RDL_LIBS@ $(LDADDS) | |
20ab1f03 | 38 | +xmllint_LDADD= $(RDL_LIBS) libxml2.la |
392ede6a | 39 | |
40 | testSAX_SOURCES=testSAX.c | |
41 | testSAX_LDFLAGS = | |
20ab1f03 | 42 | @@ -689,8 +689,6 @@ |
392ede6a | 43 | |
44 | CLEANFILES=xml2Conf.sh | |
45 | ||
46 | -confexecdir=$(libdir) | |
47 | -confexec_DATA = xml2Conf.sh | |
48 | EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml.spec \ | |
20ab1f03 | 49 | libxml.m4 Copyright check-xml-test-suite.py \ |
392ede6a | 50 | example/Makefile.am example/gjobread.c example/gjobs.xml \ |
c87b4ab3 | 51 | --- libxml2-2.4.7.orig/include/libxml/Makefile.am Sun Oct 14 04:35:07 2001 |
52 | +++ libxml2-2.4.7/include/libxml/Makefile.am Tue Oct 30 19:06:00 2001 | |
53 | @@ -33,7 +33,4 @@ | |
54 | threads.h \ | |
55 | globals.h | |
56 | ||
57 | -install-exec-hook: | |
58 | - $(mkinstalldirs) $(DESTDIR)$(xmlincdir) | |
59 | - | |
60 | EXTRA_DIST = xmlversion.h.in xmlwin32version.h.in |