updating Makefiles to fix the prelinking. Daniel

* Makefile.am configure.in breakpoint/Makefile.am libexslt/Makefile.am:
  updating Makefiles to fix the prelinking.
Daniel

diff --git a/ChangeLog b/ChangeLog
index f86fab5aef63693973a04f54f68a3675652c5320..69dcd5006f7fa53963d34a26a10bd1abd9d8aca0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 8304ebb2cdceb38ed5aa9fdd9880c528bf7391b3..cefe03744b11d587a0edd70671cf3118f77b56a0 100644 (file)
--- 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 3b3ee61530c93f33002030d8df7fba684e6893d0..c876df780538e920f60a75f7905e1aa83b5151b9 100644 (file)
--- 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 b3ddf8b9b963c11a8a9e2c9018af4ee95644acdd..dfe086bf530c73ddd916f847769221b5b226e49d 100644 (file)
--- 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 c50fa89b65c5da392aa2d04568f74cac5370a7b7..e24711b730926a5cc630b890aa2bc33635ada6cd 100644 (file)
--- 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 87b85b89592148fd85b96e5c112309b76ecd0aa1..1406602b9eff1d073e452a78435aed4be5b3b1cb 100644 (file)
--- 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