diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | breakpoint/Makefile.am | 4 | ||||
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | libexslt/Makefile.am | 2 | ||||
| -rw-r--r-- | xsltproc/xsltproc.c | 36 |
6 files changed, 40 insertions, 26 deletions
@@ -1,3 +1,8 @@ +Mon Nov 26 10:27:30 CET 2001 Daniel Veillard <daniel@veillard.com> + + * Makefile.am configure.in breakpoint/Makefile.am libexslt/Makefile.am: + updating Makefiles to fix the prelinking. + Sun Nov 25 15:52:38 CET 2001 Daniel Veillard <daniel@veillard.com> * libxslt/transform.c: fixed a bug in the document extension diff --git a/Makefile.am b/Makefile.am index 8304ebb2..cefe0374 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,20 @@ +## don't bother compiling the breakpoint library unless it is needed +if WITH_DEBUGGER +SUBDIRS = \ + breakpoint \ + libxslt \ + libexslt \ + xsltproc \ + tests \ + doc +else SUBDIRS = \ libxslt \ - breakpoint \ libexslt \ xsltproc \ tests \ doc +endif confexecdir=$(libdir) confexec_DATA = xsltConf.sh diff --git a/breakpoint/Makefile.am b/breakpoint/Makefile.am index 3b3ee615..c876df78 100644 --- a/breakpoint/Makefile.am +++ b/breakpoint/Makefile.am @@ -4,7 +4,7 @@ lib_LTLIBRARIES = libxsltbreakpoint.la xsltbreakpointincdir = $(includedir)/breakpoint -xsltbreakpointinc_HEADERS = \ +xsltbreakpointinc_HEADERS = \ breakpoint.h libxsltbreakpoint_la_SOURCES = \ @@ -14,7 +14,7 @@ libxsltbreakpoint_la_SOURCES = \ dbgmain.c -libxsltbreakpoint_la_LIBADD = $(EXTRA_LIBS) +libxsltbreakpoint_la_LIBADD = -lxml2 $(M_LIBS) libxsltbreakpoint_la_LDFLAGS = -version-info @LIBXSLT_VERSION_INFO@ man_MANS = #breakpoint.4 diff --git a/configure.in b/configure.in index b3ddf8b9..dfe086bf 100644 --- a/configure.in +++ b/configure.in @@ -241,15 +241,11 @@ AC_SUBST(LDFLAGS) dnl dnl In build tree I use a static version with memory debug enabled -dnl libtool 1.4 tries to use the shared lib and this won't work -dnl libtool is a 5000+ line of perl module and hence absolutely pure crap -dnl no surprise there. dnl if test "${LOGNAME}" = "veillard" -a "`pwd`" = "/u/veillard/XSLT" ; then LIBXML_LIBS="../../XML/.libs/libxml2.a -lz" DV_LINK="1" fi -AM_CONDITIONAL(DV_STATIC_LINK, test "${DV_LINK}" = "1") AC_SUBST(XML_CONFIG) AC_SUBST(LIBXML_LIBS) @@ -266,11 +262,12 @@ esac XSLT_INCLUDEDIR='-I${includedir}' if test "${WITH_DEBUGGER}" = "1" ; then XSLT_LIBS="-lxslt -lxsltbreakpoint $LIBXML_LIBS $M_LIBS" + EXTRA_LIBS='$(top_builddir)/breakpoint/libxsltbreakpoint.la'" $LIBXML_LIBS $M_LIBS" else XSLT_LIBS="-lxslt $LIBXML_LIBS $M_LIBS" + EXTRA_LIBS="$LIBXML_LIBS $M_LIBS" fi -EXTRA_LIBS="-lxml2 $M_LIBS" AC_SUBST(XSLT_LIBDIR) AC_SUBST(XSLT_INCLUDEDIR) AC_SUBST(EXTRA_LIBS) diff --git a/libexslt/Makefile.am b/libexslt/Makefile.am index c50fa89b..e24711b7 100644 --- a/libexslt/Makefile.am +++ b/libexslt/Makefile.am @@ -22,7 +22,7 @@ libexslt_la_SOURCES = \ date.c \ saxon.c -libexslt_la_LIBADD = $(EXTRA_LIBS) +libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) libexslt_la_LDFLAGS = -version-info @LIBEXSLT_VERSION_INFO@ man_MANS = libexslt.4 diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c index 87b85b89..1406602b 100644 --- a/xsltproc/xsltproc.c +++ b/xsltproc/xsltproc.c @@ -295,31 +295,33 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur, const char *filename) { static void usage(const char *name) { printf("Usage: %s [options] stylesheet file [file ...]\n", name); printf(" Options:\n"); - printf(" --version or -V: show the version of libxml and libxslt used\n"); - printf(" --verbose or -v: show logs of what's happening\n"); - printf(" --output file or -o file: save to a given file\n"); - printf(" --timing: display the time used\n"); - printf(" --repeat: run the transformation 20 times\n"); - printf(" --debug: dump the tree of the result instead\n"); - printf(" --novalid: skip the Dtd loading phase\n"); - printf(" --noout: do not dump the result\n"); - printf(" --maxdepth val : increase the maximum depth\n"); + printf("\t--version or -V: show the version of libxml and libxslt used\n"); + printf("\t--verbose or -v: show logs of what's happening\n"); + printf("\t--output file or -o file: save to a given file\n"); + printf("\t--timing: display the time used\n"); + printf("\t--repeat: run the transformation 20 times\n"); + printf("\t--debug: dump the tree of the result instead\n"); + printf("\t--novalid: skip the Dtd loading phase\n"); + printf("\t--noout: do not dump the result\n"); + printf("\t--maxdepth val : increase the maximum depth\n"); #ifdef LIBXML_HTML_ENABLED - printf(" --html: the input document is(are) an HTML file(s)\n"); + printf("\t--html: the input document is(are) an HTML file(s)\n"); #endif #ifdef LIBXML_DOCB_ENABLED - printf(" --docbook: the input document is SGML docbook\n"); + printf("\t--docbook: the input document is SGML docbook\n"); #endif - printf(" --param name value : pass a (parameter,value) pair\n"); - printf(" string values must be quoted like \"'string'\"\n"); - printf(" --nonet refuse to fetch DTDs or entities over network\n"); + printf("\t--param name value : pass a (parameter,value) pair\n"); + printf("\t string values must be quoted like \"'string'\"\n"); + printf("\t--nonet refuse to fetch DTDs or entities over network\n"); #ifdef LIBXML_CATALOG_ENABLED - printf(" --catalogs : use the catalogs from $SGML_CATALOG_FILES\n"); + printf("\t--catalogs : use SGML catalogs from $SGML_CATALOG_FILES\n"); + printf("\t otherwise XML Catalogs starting from \n"); + printf("\t file:///etc/xml/catalog are activated by default\n"); #endif #ifdef LIBXML_XINCLUDE_ENABLED - printf(" --xinclude : do XInclude processing on document intput\n"); + printf("\t--xinclude : do XInclude processing on document intput\n"); #endif - printf(" --profile or --norman : dump profiling informations \n"); + printf("\t--profile or --norman : dump profiling informations \n"); } int |