]>
Commit | Line | Data |
---|---|---|
c87b4ab3 | 1 | diff -Nur libxml2-2.4.7.orig/Makefile.am libxml2-2.4.7/Makefile.am |
2 | --- libxml2-2.4.7.orig/Makefile.am Tue Oct 30 14:04:41 2001 | |
3 | +++ libxml2-2.4.7/Makefile.am Tue Oct 30 19:07:47 2001 | |
4 | @@ -3,7 +3,7 @@ | |
392ede6a | 5 | |
6 | SUBDIRS = include . doc example | |
7 | ||
c87b4ab3 | 8 | -INCLUDES = -I@srcdir@/include -I$(top_builddir)/include @THREAD_CFLAGS@ @Z_CFLAGS@ |
9 | +INCLUDES = -I$(srcdir)/include -I$(top_builddir)/include $(THREAD_CFLAGS) $(Z_CFLAGS) | |
392ede6a | 10 | |
c87b4ab3 | 11 | noinst_PROGRAMS=testSAX testHTML testXPath testURI testDocbook testThreads |
392ede6a | 12 | |
c87b4ab3 | 13 | @@ -12,9 +12,9 @@ |
392ede6a | 14 | bin_SCRIPTS=xml2-config |
15 | ||
16 | lib_LTLIBRARIES = libxml2.la | |
17 | -libxml2_la_LIBADD = @Z_LIBS@ $(ICONV_LIBS) -lm | |
18 | +libxml2_la_LIBADD = $(Z_LIBS) $(ICONV_LIBS) -lm | |
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 \ | |
c87b4ab3 | 25 | @@ -33,7 +33,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 | |
c87b4ab3 | 32 | man_MANS = xml2-config.1 libxml.4 |
392ede6a | 33 | |
c87b4ab3 | 34 | @@ -43,7 +43,7 @@ |
392ede6a | 35 | xmllint_SOURCES=xmllint.c |
36 | xmllint_LDFLAGS = | |
37 | xmllint_DEPENDENCIES = $(DEPS) | |
38 | -xmllint_LDADD= @RDL_LIBS@ $(LDADDS) | |
39 | +xmllint_LDADD= $(RDL_LIBS) $(LDADDS) | |
40 | ||
41 | testSAX_SOURCES=testSAX.c | |
42 | testSAX_LDFLAGS = | |
c87b4ab3 | 43 | @@ -531,8 +531,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 \ | |
50 | libxml.m4 \ | |
51 | example/Makefile.am example/gjobread.c example/gjobs.xml \ | |
c87b4ab3 | 52 | diff -Nur libxml2-2.4.7.orig/include/libxml/Makefile.am libxml2-2.4.7/include/libxml/Makefile.am |
53 | --- libxml2-2.4.7.orig/include/libxml/Makefile.am Sun Oct 14 04:35:07 2001 | |
54 | +++ libxml2-2.4.7/include/libxml/Makefile.am Tue Oct 30 19:06:00 2001 | |
55 | @@ -33,7 +33,4 @@ | |
56 | threads.h \ | |
57 | globals.h | |
58 | ||
59 | -install-exec-hook: | |
60 | - $(mkinstalldirs) $(DESTDIR)$(xmlincdir) | |
61 | - | |
62 | EXTRA_DIST = xmlversion.h.in xmlwin32version.h.in |