diff --git a/ChangeLog b/ChangeLog index cf1df53a..49e9290f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Jan 17 10:34:39 CET 2002 Daniel Veillard + + * xsltproc/Makefile.am configure.in: ugly way to keep + the memory debugging active on my devel workstation + by bypassing libtool completely + Tue Jan 15 12:00:18 CET 2002 Daniel Veillard * libxslt/templates.c: fixed bug #68751 diff --git a/configure.in b/configure.in index ece2ceaa..9f573c76 100644 --- a/configure.in +++ b/configure.in @@ -285,8 +285,10 @@ dnl if test "${LOGNAME}" = "veillard" -a "`pwd`" = "/u/veillard/XSLT" ; then LIBXML_LIBS="../../XML/.libs/libxml2.a -lz" DV_LINK="1" + XSLTPROCDV="xsltproc.dv" fi +AC_SUBST(XSLTPROCDV) AC_SUBST(XML_CONFIG) AC_SUBST(LIBXML_LIBS) AC_SUBST(LIBXML_CFLAGS) diff --git a/xsltproc/Makefile.am b/xsltproc/Makefile.am index 931a4786..7b8809a6 100644 --- a/xsltproc/Makefile.am +++ b/xsltproc/Makefile.am @@ -2,9 +2,8 @@ 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) -programs=xsltproc - -bin_PROGRAMS = $(programs) +EXTRA_PROGRAMS= +bin_PROGRAMS = xsltproc $(XSLTPROCDV) xsltproc_SOURCES = xsltproc.c xsltproc_LDFLAGS = @@ -17,3 +16,6 @@ DEPS = $(top_builddir)/libxslt/libxslt.la \ LDADDS = $(top_builddir)/libxslt/libxslt.la \ $(top_builddir)/libexslt/libexslt.la \ @LIBXML_LIBS@ $(EXTRA_LIBS) + +xsltproc.dv: xsltproc.o + $(CC) $(CFLAGS) -o xsltproc xsltproc.o ../libexslt/.libs/libexslt.a ../libxslt/.libs/libxslt.a @LIBXML_LIBS@ $(EXTRA_LIBS)