ocaml 3.09 transition

[helm.git] / helm / DEVEL / gdome_xslt / ocaml / gdome_xslt / Makefile.am

diff --git a/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.am b/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.am
index 6fa7a7f96edf34297d28faf6422e5370fbee68de..4da9bef886c84e9faa14755cad08202ea1149406 100644 (file)
--- a/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.am
+++ b/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.am
@@ -16,7 +16,7 @@ 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 \
@@ -41,29 +41,17 @@ 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)
 
 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     \