diff options
author | Daniel Veillard <veillard@src.gnome.org> | 2001-08-15 13:21:46 +0000 |
---|---|---|
committer | Daniel Veillard <veillard@src.gnome.org> | 2001-08-15 13:21:46 +0000 |
commit | 307550093f660df6f9fd96bace12d9d701fbf702 (patch) | |
tree | df102721ac53bb584588f13f9e1daf64db26f666 | |
parent | 6a4dc180f23ce156e6dd3a8b8fdb814c0f58b4f0 (diff) | |
download | libxslt-307550093f660df6f9fd96bace12d9d701fbf702.tar.gz libxslt-307550093f660df6f9fd96bace12d9d701fbf702.tar.bz2 libxslt-307550093f660df6f9fd96bace12d9d701fbf702.zip |
release of 1.0.2 cleaning of Makefiles pointed out by make distcheck
* Makefile.am config.h.in configure.in libxslt/xsltwin32config.h:
release of 1.0.2
* tests/docs/Makefile.am libexslt/Makefile.am
tests/documents/Makefile.am tests/general/Makefile.am
xsltproc/Makefile.am: cleaning of Makefiles pointed out
by make distcheck
Daniel
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | Makefile.am | 6 | ||||
-rw-r--r-- | config.h.in | 3 | ||||
-rw-r--r-- | configure.in | 11 | ||||
-rw-r--r-- | libexslt/Makefile.am | 10 | ||||
-rw-r--r-- | libxslt/xsltwin32config.h | 6 | ||||
-rw-r--r-- | tests/docs/Makefile.am | 10 | ||||
-rw-r--r-- | tests/documents/Makefile.am | 2 | ||||
-rw-r--r-- | tests/general/Makefile.am | 10 | ||||
-rw-r--r-- | xsltproc/Makefile.am | 6 |
10 files changed, 44 insertions, 29 deletions
@@ -1,3 +1,12 @@ +Wed Aug 15 15:19:14 CEST 2001 Daniel Veillard <daniel@veillard.com> + + * Makefile.am config.h.in configure.in libxslt/xsltwin32config.h: + release of 1.0.2 + * tests/docs/Makefile.am libexslt/Makefile.am + tests/documents/Makefile.am tests/general/Makefile.am + xsltproc/Makefile.am: cleaning of Makefiles pointed out + by make distcheck + Wed Aug 15 13:54:41 CEST 2001 Daniel Veillard <daniel@veillard.com> * libxslt/functions.h libxslt/transform.c: a bit of cleanup diff --git a/Makefile.am b/Makefile.am index dd8c4001..b5ae68c6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,11 +10,13 @@ confexec_DATA = xsltConf.sh bin_SCRIPTS = xslt-config -dist-hook: libxml.spec +dist-hook: libxslt.spec (cd $(srcdir) ; tar -cf - --exclude CVS win32) | (cd $(distdir); tar xf -) EXTRA_DIST = xsltConf.sh.in xslt-config.in libxslt.spec libxslt.spec.in \ - FEATURES TODO COPYING.LIB Copyright IPR + FEATURES TODO COPYING.LIB Copyright IPR \ + win32/libxslt/libxslt.def win32/libxslt/libxslt.dsw \ + win32/libxslt/libxslt_so.dsp win32/libxslt/xsltproc.dsp ## We create xsltConf.sh here and not from configure because we want ## to get the paths expanded correctly. Macros like srcdir are given diff --git a/config.h.in b/config.h.in index db211355..cd82f1b0 100644 --- a/config.h.in +++ b/config.h.in @@ -27,6 +27,9 @@ /* Define if you have the <ansidecl.h> header file. */ #undef HAVE_ANSIDECL_H +/* Define if you have the <dlfcn.h> header file. */ +#undef HAVE_DLFCN_H + /* Define if you have the <float.h> header file. */ #undef HAVE_FLOAT_H diff --git a/configure.in b/configure.in index 9a71a69f..1af7a821 100644 --- a/configure.in +++ b/configure.in @@ -5,8 +5,13 @@ dnl libxslt is the main part of the package dnl LIBXSLT_MAJOR_VERSION=1 LIBXSLT_MINOR_VERSION=0 -LIBXSLT_MICRO_VERSION=1 +LIBXSLT_MICRO_VERSION=2 PACKAGE=libxslt +LIBEXSLT_MAJOR_VERSION=0 +LIBEXSLT_MINOR_VERSION=3 +LIBEXSLT_MICRO_VERSION=0 +LIBXML_REQUIRED_VERSION=2.4.2 + LIBXSLT_VERSION=$LIBXSLT_MAJOR_VERSION.$LIBXSLT_MINOR_VERSION.$LIBXSLT_MICRO_VERSION LIBXSLT_VERSION_INFO=`expr $LIBXSLT_MAJOR_VERSION + $LIBXSLT_MINOR_VERSION`:$LIBXSLT_MICRO_VERSION:$LIBXSLT_MINOR_VERSION @@ -23,9 +28,6 @@ AC_SUBST(LIBXSLT_VERSION_NUMBER) dnl dnl libexslt is an extension library dnl -LIBEXSLT_MAJOR_VERSION=0 -LIBEXSLT_MINOR_VERSION=2 -LIBEXSLT_MICRO_VERSION=0 LIBEXSLT_VERSION=$LIBEXSLT_MAJOR_VERSION.$LIBEXSLT_MINOR_VERSION.$LIBEXSLT_MICRO_VERSION LIBEXSLT_VERSION_INFO=`expr $LIBEXSLT_MAJOR_VERSION + $LIBEXSLT_MINOR_VERSION`:$LIBEXSLT_MICRO_VERSION:$LIBEXSLT_MINOR_VERSION @@ -167,7 +169,6 @@ dnl dnl find libxml dnl XML_CONFIG="xml2-config" -LIBXML_REQUIRED_VERSION=2.4.1 AC_SUBST(LIBXML_REQUIRED_VERSION) AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) if test "x$LIBXML_PREFIX" != "x" diff --git a/libexslt/Makefile.am b/libexslt/Makefile.am index 6efe421b..982ea7a1 100644 --- a/libexslt/Makefile.am +++ b/libexslt/Makefile.am @@ -1,5 +1,6 @@ -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libexslt -I$(top_builddir)/libxslt \ - $(LIBXML_CFLAGS) $(CFLAGS) +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libxslt -I$(top_srcdir)/libexslt \ + -I$(top_builddir) -I$(top_builddir)/libxslt \ + -I$(top_builddir)/libexslt $(LIBXML_CFLAGS) $(CFLAGS) lib_LTLIBRARIES = libexslt.la @@ -7,6 +8,8 @@ exsltincdir = $(includedir)/libexslt exsltinc_HEADERS = \ exslt.h \ + exsltconfig.h \ + exslt.h \ exsltconfig.h libexslt_la_SOURCES = \ @@ -19,6 +22,3 @@ libexslt_la_SOURCES = \ libexslt_la_LIBADD = $(EXTRA_LIBS) libexslt_la_LDFLAGS = -version-info @LIBEXSLT_VERSION_INFO@ -DEPS = $(lib_LTLIBRARIES) -LDADDS = -L. $(top_builddir)/libexslt/libexslt.la $(EXTRA_LIBS) \ - $(top_builddir)/libxslt/libxslt.la diff --git a/libxslt/xsltwin32config.h b/libxslt/xsltwin32config.h index 9372a937..3eab9bf1 100644 --- a/libxslt/xsltwin32config.h +++ b/libxslt/xsltwin32config.h @@ -21,21 +21,21 @@ extern "C" { * * the version string like "1.2.3" */ -#define LIBXSLT_DOTTED_VERSION "1.0.1" +#define LIBXSLT_DOTTED_VERSION "1.0.2" /** * LIBXSLT_VERSION: * * the version number: 1.2.3 value is 1002003 */ -#define LIBXSLT_VERSION 10001 +#define LIBXSLT_VERSION 10002 /** * LIBXSLT_VERSION_STRING: * * the version number string, 1.2.3 value is "1002003" */ -#define LIBXSLT_VERSION_STRING "10001" +#define LIBXSLT_VERSION_STRING "10002" /** * WITH_XSLT_DEBUG: diff --git a/tests/docs/Makefile.am b/tests/docs/Makefile.am index 231b77e9..36507a2e 100644 --- a/tests/docs/Makefile.am +++ b/tests/docs/Makefile.am @@ -54,11 +54,11 @@ EXTRA_DIST = \ bug-48-.xml \ bug-49-.xml \ bug-50-.xml \ - bug-52-.xml \ - bug-53-.xml \ - bug-54-.xml \ - bug-55-.xml \ - bug-56-.xml \ + bug-52.xml \ + bug-53.xml \ + bug-54.xml \ + bug-55.xml \ + bug-56.xml \ character.xml \ array.xml \ items.xml diff --git a/tests/documents/Makefile.am b/tests/documents/Makefile.am index 7a4fc00b..078d618f 100644 --- a/tests/documents/Makefile.am +++ b/tests/documents/Makefile.am @@ -5,7 +5,7 @@ $(top_builddir)/xsltproc/xsltproc: EXTRA_DIST = bredfort.css index.xml system.xml \ bredfort.xsl menu.xml worklog.xml \ - result.xhtml 'doc file.xml' docfile.xml \ + result.xhtml docfile.xml doc\ file.xml \ test.xml test.xsl test.result diff --git a/tests/general/Makefile.am b/tests/general/Makefile.am index 1ec7c84f..d834ae9a 100644 --- a/tests/general/Makefile.am +++ b/tests/general/Makefile.am @@ -56,11 +56,11 @@ EXTRA_DIST = \ bug-48-.out bug-48-.xsl \ bug-49-.out bug-49-.xsl \ bug-50-.out bug-50-.xsl \ - bug-52-.out bug-52-.xsl \ - bug-53-.out bug-53-.xsl \ - bug-54-.out bug-54-.xsl \ - bug-55-.out bug-55-.xsl \ - bug-56-.out bug-56-.xsl \ + bug-52.out bug-52.xsl \ + bug-53.out bug-53.xsl \ + bug-54.out bug-54.xsl \ + bug-55.out bug-55.xsl \ + bug-56.out bug-56.xsl \ character.out character.xsl \ character2.out character2.xsl \ itemschoose.out itemschoose.xsl \ diff --git a/xsltproc/Makefile.am b/xsltproc/Makefile.am index 3d680ce9..89f0fdc8 100644 --- a/xsltproc/Makefile.am +++ b/xsltproc/Makefile.am @@ -1,6 +1,6 @@ -INCLUDES = -I$(top_srcdir) -I$(top_builddir)/libxslt -I$(top_builddir)/libexslt -I$(top_srcdir)/libxslt -I$(top_srcdir)/libexslt \ - $(LIBXML_CFLAGS) $(CFLAGS) - +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libxslt -I$(top_srcdir)/libexslt \ + -I$(top_builddir) -I$(top_builddir)/libxslt \ + -I$(top_builddir)/libexslt $(LIBXML_CFLAGS) $(CFLAGS) bin_PROGRAMS = xsltproc |