* further code cleanup

diff --git a/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.am b/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.am
index fbd41c365341992351789ce764a1e11a4066fda4..d27eb4c0c746e5830fa380bc09ae7b09c1aac9da 100644 (file)
--- a/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.am
+++ b/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.am
@@ -12,6 +12,8 @@ OCAMLFIND = @OCAMLFIND@
 OCAMLMKLIB = ocamlmklib
 DLL = dll$(ARCHIVE).so
 
+BUILT_SOURCES = gdome_xslt.c
+
 CLEANFILES = \
   $(ARCHIVE).cma $(ARCHIVE).cmxa $(ARCHIVE).a lib$(ARCHIVE).a $(DLL)   \
   *.cmo *.cmx *.cmi
@@ -32,15 +34,18 @@ noinst_DATA =       \
 endif
 
 noinst_LTLIBRARIES = libmlgdome2-xslt.la
-C_SRC = ml_gdome_xslt.c
+C_SRC = ml_gdome_xslt.c gdome_xslt.c
 libmlgdome2_xslt_la_SOURCES = $(C_SRC)
 
-O_S = $(C_SRC:%.c=%.o) $(top_builddir)/C/gdome_xslt/gdome_xslt.o
+O_S = $(C_SRC:%.c=%.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
 
+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)
 
@@ -59,9 +64,6 @@ $(ARCHIVE).cmxa: $(CMXA_DEPS)
 #
 $(DLL) lib$(ARCHIVE).a: $(O_S)
        $(OCAMLMKLIB) -o $(ARCHIVE) -L@OCAMLSTUBDIR@ $(O_S)  $(SHARED_LIBS)
-       for f in $(O_S); do     \
-               rm $$f; \
-       done
 
 INCLUDES = $(GDOME_CFLAGS) $(MLGDOME_CFLAGS) -I/usr/include/caml -I$(top_srcdir)/C/gdome_xslt