* changed version in configure.ac

* gdome_xslt.c renamed into x_gdome_xslt.c otherwise there was a conflict
  with make rules that prevented gdome_xslt.o from being built correctly

diff --git a/helm/DEVEL/gdome_xslt/configure.ac b/helm/DEVEL/gdome_xslt/configure.ac
index 89193537ac2471418ae3ca3bdf1f607271ef8e38..b8c3b7f29361e357a5f52dba858bc34fb8b3b54c 100644 (file)
--- a/helm/DEVEL/gdome_xslt/configure.ac
+++ b/helm/DEVEL/gdome_xslt/configure.ac
@@ -3,7 +3,7 @@ AC_INIT
 AC_CONFIG_SRCDIR([C/gdome_xslt/gdome_xslt.h])
 
 PACKAGE=gdome2-xslt
-VERSION=0.0.5
+VERSION=0.0.6
 VERSION_INFO=`echo $VERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'`
 AC_SUBST(VERSION_INFO)
 

diff --git a/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.am b/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.am
index d27eb4c0c746e5830fa380bc09ae7b09c1aac9da..21e3954b84be0f8dd30ee88d5d902fe4d1d18472 100644 (file)
--- a/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.am
+++ b/helm/DEVEL/gdome_xslt/ocaml/gdome_xslt/Makefile.am
@@ -12,7 +12,7 @@ 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)   \
@@ -34,7 +34,7 @@ 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)
@@ -43,7 +43,7 @@ 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
+x_gdome_xslt.c: $(top_srcdir)/C/gdome_xslt/gdome_xslt.c
        cp $< $@
 
 $(ARCHIVE).cma: $(CMA_DEPS)
@@ -63,7 +63,7 @@ $(ARCHIVE).cmxa: $(CMXA_DEPS)
 # done
 #
 $(DLL) lib$(ARCHIVE).a: $(O_S)
-       $(OCAMLMKLIB) -o $(ARCHIVE) -L@OCAMLSTUBDIR@ $(O_S)  $(SHARED_LIBS)
+       $(OCAMLMKLIB) -o $(ARCHIVE) -L@OCAMLSTUBDIR@ $(O_S) $(SHARED_LIBS)
 
 INCLUDES = $(GDOME_CFLAGS) $(MLGDOME_CFLAGS) -I/usr/include/caml -I$(top_srcdir)/C/gdome_xslt
 

diff --git a/helm/DEVEL/gdome_xslt/ocaml/test/Makefile.am b/helm/DEVEL/gdome_xslt/ocaml/test/Makefile.am
index 58be30f90df2913b1285181856d71c4172b4a2c1..95f83fa79936ad4ab82b7bf40015e48f7022a669 100644 (file)
--- a/helm/DEVEL/gdome_xslt/ocaml/test/Makefile.am
+++ b/helm/DEVEL/gdome_xslt/ocaml/test/Makefile.am
@@ -19,6 +19,7 @@ endif
 
 test: test.ml $(CMA) $(INIT_CMO)
        $(OCAMLC) -o $@ -linkpkg $(OCAMLC_FLAGS) $(CMA) $(INIT_CMO) $<
+
 test.opt: test.ml $(CMXA) $(INIT_CMX)
        $(OCAMLOPT) -o $@ -linkpkg $(OCAMLC_FLAGS) $(CMXA) $(INIT_CMX) $<