* updated #include directives

* clean up of some makefiles

diff --git a/helm/DEVEL/gdome_xslt/C/gdome_xslt/gdome_xslt.c b/helm/DEVEL/gdome_xslt/C/gdome_xslt/gdome_xslt.c
index 2c34f9cb5512c36fae056f7ccf800e14822320d1..232f14b12b7e4945965ae1775f50a78058efb6ca 100644 (file)
--- a/helm/DEVEL/gdome_xslt/C/gdome_xslt/gdome_xslt.c
+++ b/helm/DEVEL/gdome_xslt/C/gdome_xslt/gdome_xslt.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
-#include <libgdome/gdome.h>
+#include <gdome.h>
 #include <libxslt/xsltconfig.h>
 #include <libxslt/xslt.h>
 #include <libxslt/xsltutils.h>

diff --git a/helm/DEVEL/gdome_xslt/C/test/test.c b/helm/DEVEL/gdome_xslt/C/test/test.c
index a37c471f53b79b0f692e020db1ab3bcc7127c5a2..2f39ba87a4c81adc9a0f35ae79cb2e3c21d38532 100644 (file)
--- a/helm/DEVEL/gdome_xslt/C/test/test.c
+++ b/helm/DEVEL/gdome_xslt/C/test/test.c
@@ -20,7 +20,7 @@
  */
 
 #include <stdio.h>
-#include <libgdome/gdome.h>
+#include <gdome.h>
 #include <libxslt/xsltconfig.h>
 #include <libxslt/xslt.h>
 #include <libxslt/imports.h>

diff --git a/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.am b/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.am
index 3524a9f1d5ac472c5b47f0b6eb89c83d1a23afd5..fbd41c365341992351789ce764a1e11a4066fda4 100644 (file)
--- a/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.am
+++ b/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.am
@@ -35,11 +35,11 @@ noinst_LTLIBRARIES = libmlgdome2-xslt.la
 C_SRC = ml_gdome_xslt.c
 libmlgdome2_xslt_la_SOURCES = $(C_SRC)
 
-O_S = $(C_SRC:%.c=%.o)
-LO_S = $(O_S:%.o=%.lo) $(top_builddir)/C/gdome_xslt/gdome_xslt.lo
+O_S = $(C_SRC:%.c=%.o) $(top_builddir)/C/gdome_xslt/gdome_xslt.o
+LO_S = $(O_S:%.o=%.lo)
 CMA_DEPS = i_gdome_xslt.cmo gdome_xslt.cmo
 CMXA_DEPS = $(CMA_DEPS:%.cmo=%.cmx)
-SHARED_LIBS = -lxslt -lgdome -lglib -lxml2 -lmlgdome
+SHARED_LIBS = $(LIBXSLT_LIBS) $(GDOME_LIBS) -lmlgdome
 
 $(ARCHIVE).cma: $(CMA_DEPS)
        $(OCAMLMKLIB) -o $(ARCHIVE) -L@OCAMLSTUBDIR@ $(CMA_DEPS) $(SHARED_LIBS)
@@ -47,13 +47,19 @@ $(ARCHIVE).cma: $(CMA_DEPS)
 $(ARCHIVE).cmxa: $(CMXA_DEPS)
        $(OCAMLMKLIB) -o $(ARCHIVE) -L@OCAMLSTUBDIR@ $(CMXA_DEPS) $(SHARED_LIBS)
 
-$(DLL) lib$(ARCHIVE).a: $(LO_S)
-       # use .lo for ocamlmklib
-       for f in $(LO_S); do    \
-               cp $$f $$f.o;   \
-       done
-       $(OCAMLMKLIB) -o $(ARCHIVE) -L@OCAMLSTUBDIR@ $(LO_S:%=%.o)  $(SHARED_LIBS)
-       for f in $(LO_S:%=%.o); do      \
+# $(DLL) lib$(ARCHIVE).a: $(LO_S)
+# # use .lo for ocamlmklib
+# for f in $(LO_S); do \
+# cp $$f $$f.o;        \
+# done
+# $(OCAMLMKLIB) -o $(ARCHIVE) -L@OCAMLSTUBDIR@ $(LO_S:%=%.o)  $(SHARED_LIBS)
+# for f in $(LO_S:%=%.o); do   \
+# rm $$f;      \
+# done
+#
+$(DLL) lib$(ARCHIVE).a: $(O_S)
+       $(OCAMLMKLIB) -o $(ARCHIVE) -L@OCAMLSTUBDIR@ $(O_S)  $(SHARED_LIBS)
+       for f in $(O_S); do     \
                rm $$f; \
        done