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=d27eb4c0c746e5830fa380bc09ae7b09c1aac9da;hpb=910ede646eac96a5730a9a6d273817d4f9ddc9c2;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 d27eb4c0c..4da9bef88 100644
--- a/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.am
+++ b/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.am
@@ -12,11 +12,11 @@ OCAMLFIND = @OCAMLFIND@
 OCAMLMKLIB = ocamlmklib
 DLL = dll$(ARCHIVE).so
 
-BUILT_SOURCES = gdome_xslt.c
+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	\
@@ -34,36 +34,24 @@ noinst_DATA =	\
 endif
 
 noinst_LTLIBRARIES = libmlgdome2-xslt.la
-C_SRC = ml_gdome_xslt.c 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)
+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 = $(LIBXSLT_LIBS) $(GDOME_LIBS) -lmlgdome
+SHARED_LIBS = $(LIBXSLT_LIBS) $(GDOME_LIBS)
 
-gdome_xslt.c: $(top_srcdir)/C/gdome_xslt/gdome_xslt.c
+x_gdome_xslt.c: $(top_srcdir)/C/gdome_xslt/gdome_xslt.c
 	cp $< $@
 
 $(ARCHIVE).cma: $(CMA_DEPS)
-	$(OCAMLMKLIB) -o $(ARCHIVE) -L@OCAMLSTUBDIR@ $(CMA_DEPS) $(SHARED_LIBS)
-
+	$(OCAMLMKLIB) -o $(ARCHIVE) $^ $(SHARED_LIBS)
 $(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	\
-# rm $$f;	\
-# done
-#
-$(DLL) lib$(ARCHIVE).a: $(O_S)
-	$(OCAMLMKLIB) -o $(ARCHIVE) -L@OCAMLSTUBDIR@ $(O_S)  $(SHARED_LIBS)
+	$(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
 
@@ -93,7 +81,6 @@ endif
 	else	\
 		$(INSTALL_DATA) $(DLL) $(STUBSDIR);	\
 	fi
-	ln -fs $(DLL) $(STUBSDIR)/lib$(ARCHIVE).so
 
 uninstall-local:
 	if [ "x$(OCAMLFIND)" != "x" ]; then	\