From: Luca Padovani <luca.padovani@unito.it>
Date: Fri, 3 Oct 2003 14:03:15 +0000 (+0000)
Subject: * updated #include directives
X-Git-Tag: V_0_4_3_4~4
X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=2fe74a94a68285d9fa169fb73cf43183cc21e157;p=helm.git

* 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 2c34f9cb5..232f14b12 100644
--- 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 a37c471f5..2f39ba87a 100644
--- 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 3524a9f1d..fbd41c365 100644
--- 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