]>
Commit | Line | Data |
---|---|---|
f4a2b5c2 | 1 | --- libxml-1.8.16/Makefile.am~ Thu Jun 28 16:53:53 2001 |
2 | +++ libxml-1.8.16/Makefile.am Sun Sep 16 21:31:24 2001 | |
3 | @@ -2,18 +2,18 @@ | |
4 | ||
5 | SUBDIRS = doc | |
6 | ||
7 | -INCLUDES = -I@srcdir@ @Z_CFLAGS@ @CORBA_CFLAGS@ $(VERSION_FLAGS) | |
8 | +INCLUDES = -I$(srcdir) $(Z_CFLAGS) $(CORBA_CFLAGS) $(VERSION_FLAGS) | |
9 | ||
10 | -VERSION_FLAGS = -DLIBXML_VERSION=\"@LIBXML_VERSION@\" | |
11 | +VERSION_FLAGS = -DLIBXML_VERSION=\"$(LIBXML_VERSION)\" | |
12 | ||
13 | noinst_PROGRAMS=tester testSAX testHTML testXPath | |
14 | ||
15 | bin_SCRIPTS=xml-config | |
16 | ||
17 | lib_LTLIBRARIES = libxml.la | |
18 | -libxml_la_LIBADD = @Z_LIBS@ | |
19 | +libxml_la_LIBADD = $(Z_LIBS) | |
20 | ||
21 | -libxml_la_LDFLAGS = -version-info @LIBXML_VERSION_INFO@ @Z_LIBS@ | |
22 | +libxml_la_LDFLAGS = -version-info $(LIBXML_VERSION_INFO) | |
23 | ||
24 | libxml_la_SOURCES = \ | |
25 | SAX.c \ | |
26 | @@ -56,8 +56,7 @@ | |
27 | xlink.h \ | |
28 | uri.h | |
29 | ||
30 | -DEPS = $(top_builddir)/libxml.la | |
31 | -LDADDS = $(top_builddir)/libxml.la @M_LIBS@ | |
32 | +LDADDS = $(top_builddir)/libxml.la | |
33 | ||
34 | tester_SOURCES=tester.c | |
35 | tester_LDFLAGS = | |
36 | @@ -274,9 +273,6 @@ | |
37 | ## the value NONE in configure if the user doesn't specify them (this | |
38 | ## is an autoconf feature, not a bug). | |
39 | ||
40 | -confexecdir=$(libdir) | |
41 | -confexec_DATA = xmlConf.sh | |
42 | - | |
43 | CLEANFILES=xmlConf.sh | |
44 | ||
45 | confexecdir=$(libdir) |