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