X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Fgdome_xslt%2Focaml%2Fgdome_xslt%2FMakefile.am;h=4da9bef886c84e9faa14755cad08202ea1149406;hb=4167cea65ca58897d1a3dbb81ff95de5074700cc;hp=0a249eafbc236ffc7f2a5c80719f50b1f592e33c;hpb=b12bb27f927ba6144ad36b4ae09ce757b92dbb7a;p=helm.git

diff --git a/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.am b/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.am
index 0a249eafb..4da9bef88 100644
--- a/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.am
+++ b/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.am
@@ -12,9 +12,11 @@ OCAMLFIND = @OCAMLFIND@
 OCAMLMKLIB = ocamlmklib
 DLL = dll$(ARCHIVE).so
 
+BUILT_SOURCES = x_gdome_xslt.c
+
 CLEANFILES = \
   $(ARCHIVE).cma $(ARCHIVE).cmxa $(ARCHIVE).a lib$(ARCHIVE).a $(DLL)	\
-  *.cmo *.cmx *.cmi
+  *.cmo *.cmx *.cmi $(BUILT_SOURCES)
 
 EXTRA_DIST =	\
 	META.in .depend	\
@@ -23,42 +25,42 @@ EXTRA_DIST =	\
 	ocaml-io.h
 
 if HAVE_OCAMLOPT_COND
-noinst_DATA = $(ARCHIVE).cma $(DLL) $(ARCHIVE).cmxa $(ARCHIVE).a gdome_xslt_init.cmo gdome_xslt_init.cmx
+noinst_DATA =	\
+	$(ARCHIVE).cma $(DLL) $(ARCHIVE).cmxa $(ARCHIVE).a lib$(ARCHIVE).a	\
+	gdome_xslt_init.cmo gdome_xslt_init.cmx
 else
-noinst_DATA = $(ARCHIVE).cma $(DLL) gdome_xslt_init.cmo
+noinst_DATA =	\
+	$(ARCHIVE).cma $(DLL) gdome_xslt_init.cmo lib$(ARCHIVE).a
 endif
 
 noinst_LTLIBRARIES = libmlgdome2-xslt.la
-
-C_SRC = ml_gdome_xslt.c
+C_SRC = ml_gdome_xslt.c x_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=.libs/%.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)
 
-$(ARCHIVE).cma: $(CMA_DEPS)
-	$(OCAMLMKLIB) -o $(ARCHIVE) -L@OCAMLSTUBDIR@ $(CMA_DEPS) $(SHARED_LIBS)
+x_gdome_xslt.c: $(top_srcdir)/C/gdome_xslt/gdome_xslt.c
+	cp $< $@
 
+$(ARCHIVE).cma: $(CMA_DEPS)
+	$(OCAMLMKLIB) -o $(ARCHIVE) $^ $(SHARED_LIBS)
 $(ARCHIVE).cmxa: $(CMXA_DEPS)
-	$(OCAMLMKLIB) -o $(ARCHIVE) -L@OCAMLSTUBDIR@ $(CMXA_DEPS) $(SHARED_LIBS)
-
-$(DLL) $(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
+	$(OCAMLMKLIB) -o $(ARCHIVE) $^ $(SHARED_LIBS)
+lib$(ARCHIVE).a $(DLL): $(O_S)
+	$(OCAMLMKLIB) -o $(ARCHIVE) $^ $(SHARED_LIBS)
 
 INCLUDES = $(GDOME_CFLAGS) $(MLGDOME_CFLAGS) -I/usr/include/caml -I$(top_srcdir)/C/gdome_xslt
 
-BYTECODE_STUFF = $(ARCHIVE).cma $(DLL) i_gdome_xslt.cmi i_gdome_xslt.mli gdome_xslt.cmi gdome_xslt.mli gdome_xslt_init.cmi gdome_xslt_init.mli gdome_xslt_init.cmo 
-NATIVECODE_STUFF = $(ARCHIVE).cmxa $(ARCHIVE).a gdome_xslt_init.cmx
+BYTECODE_STUFF =	\
+	$(ARCHIVE).cma $(DLL) i_gdome_xslt.cmi i_gdome_xslt.ml gdome_xslt.cmi	\
+	gdome_xslt.mli gdome_xslt_init.cmi gdome_xslt_init.mli gdome_xslt_init.cmo	\
+	lib$(ARCHIVE).a
+NATIVECODE_STUFF =	\
+	$(ARCHIVE).cmxa $(ARCHIVE).a gdome_xslt_init.cmx gdome_xslt_init.o
 if HAVE_OCAMLOPT_COND
 install-data-local: $(BYTECODE_STUFF) $(NATIVECODE_STUFF)
 else
@@ -79,7 +81,6 @@ endif
 	else	\
 		$(INSTALL_DATA) $(DLL) $(STUBSDIR);	\
 	fi
-	ln -fs $(DLL) $(STUBSDIR)/lib$(ARCHIVE).so
 
 uninstall-local:
 	if [ "x$(OCAMLFIND)" != "x" ]; then	\