From: Stefano Zacchiroli <zack@upsilon.cc>
Date: Wed, 15 Jun 2005 12:39:52 +0000 (+0000)
Subject: enable static linking of C stub code
X-Git-Tag: PRE_STORAGE~5
X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=cc4a7a8433adcd1d76c124b8843bc707b446254b;p=helm.git

enable static linking of C stub code
---

diff --git a/helm/DEVEL/lablgtkmathview/Makefile.in b/helm/DEVEL/lablgtkmathview/Makefile.in
index 4005b54f5..82e3608e4 100644
--- a/helm/DEVEL/lablgtkmathview/Makefile.in
+++ b/helm/DEVEL/lablgtkmathview/Makefile.in
@@ -4,13 +4,21 @@ INCLUDEDIR = @OCAML_INCLUDE_DIR@
 PROPCC = @OCAML_LIB_DIR@/lablgtk2/propcc
 PREFIX = 
 OBJECTS_C = ml_gtk_mathview.o
-OBJECTS =  gtkMathViewProps.cmo ogtkMathViewProps.cmo gtk_mathview.cmo gtkMathView.cmo gMathView.cmo gMathViewAux.cmo
+OBJECTS = gtkMathViewProps.cmo ogtkMathViewProps.cmo gtk_mathview.cmo gtkMathView.cmo gMathView.cmo gMathViewAux.cmo
 OBJECTS_OPT = gtkMathViewProps.cmx ogtkMathViewProps.cmx gtkMathView.cmx gtk_mathview.cmx gMathView.cmx gMathViewAux.cmx
 GENERATED_FILES = gtkMathViewProps.ml ogtkMathViewProps.ml
+NULL =
 INST =	\
-	META gMathView.mli gMathView.cmi gtkMathView.cmi gtk_mathview.cmi	\
-	gtkMathViewProps.cmi ogtkMathViewProps.cmi \
-	gMathViewAux.cmi gMathViewAux.mli
+	META			\
+	gMathView.mli		\
+	gMathView.cmi		\
+	gtkMathView.cmi		\
+	gtk_mathview.cmi	\
+	gtkMathViewProps.cmi	\
+	ogtkMathViewProps.cmi	\
+	gMathViewAux.cmi	\
+	gMathViewAux.mli	\
+	$(NULL)
 DIST_FILES = \
   Makefile.in configure.in gMathView.ml gMathView.mli	\
   gMathViewAux.ml gMathViewAux.mli gtkMathView.ml \
@@ -20,7 +28,7 @@ DIST_DIR = $(PACKAGE)-$(VERSION)
 DOC_FILES = AUTHORS COPYING ChangeLog NEWS README LICENSE
 REQUIRES = gdome2 lablgtk2
 PREDICATES =
-SHARED_LIBS = @GDOME_LIBS@ @GTKMATHVIEW_LIBS@ -lmlgdome
+SHARED_LIBS = @GDOME_LIBS@ @GTKMATHVIEW_LIBS@
 
 OCAMLFIND = ocamlfind
 OCAMLC = $(OCAMLFIND) ocamlc
@@ -36,8 +44,8 @@ TESTDIR = ./test
 TMPDIR = .test
 TMPPKGDIR = $(TMPDIR)/$(PACKAGE)
 
-all: $(ARCHIVE).cma
-opt: $(ARCHIVE).cmxa
+all: $(ARCHIVE).cma lib$(ARCHIVE).a $(DLL)
+opt: $(ARCHIVE).cmxa $(ARCHIVE).a
 test: $(TESTDIR)/test
 test.opt: $(TESTDIR)/test.opt
 world: all opt
@@ -78,10 +86,12 @@ depend: *.ml *.mli $(GENERATED_FILES)
 	$(OCAMLDEP) *.ml *.mli >.depend
 include .depend
 
-$(ARCHIVE).cma $(DLL): $(OBJECTS) $(OBJECTS_C)
-	$(OCAMLMKLIB) -o $(ARCHIVE) -L$(OCAML_STUB_DIR) $^ $(SHARED_LIBS)
-$(ARCHIVE).cmxa $(ARCHIVE).a: $(OBJECTS_OPT)
-	$(OCAMLMKLIB) -o $(ARCHIVE) -L$(OCAML_STUB_DIR) $^ $(OBJECTS_C) $(SHARED_LIBS)
+$(ARCHIVE).cma: $(OBJECTS)
+	$(OCAMLMKLIB) -o $(ARCHIVE) $^ $(SHARED_LIBS)
+$(ARCHIVE).cmxa: $(OBJECTS_OPT)
+	$(OCAMLMKLIB) -o $(ARCHIVE) $^ $(SHARED_LIBS)
+lib$(ARCHIVE).a $(DLL): $(OBJECTS_C)
+	$(OCAMLMKLIB) -o $(ARCHIVE) $^ $(SHARED_LIBS)
 
 $(TESTDIR)/test: $(OBJECTS_C) $(ARCHIVE).cma $(TESTDIR)/test.ml
 	mkdir -p $(TMPPKGDIR)
@@ -99,12 +109,12 @@ install:
 	test ! -f $(ARCHIVE).cmxa || extra="$(ARCHIVE).a $(ARCHIVE).cmxa" ; \
 	if [ "$(PREFIX)" = "" ]; then \
 		$(OCAMLFIND) install	\
-			$(PACKAGE) $(OBJECTS_C) $(ARCHIVE).cma $(DLL) $(INST) $$extra;	\
-		ln -fs $(DLL) $(shell $(OCAMLFIND) printconf destdir)/stublibs/lib$(ARCHIVE).so;	\
+			$(PACKAGE) $(ARCHIVE).cma lib$(ARCHIVE).a	\
+			$(DLL) $(INST) $$extra;	\
 	else \
 		$(OCAMLFIND) install -destdir $(PREFIX)	\
-			$(PACKAGE) $(OBJECTS_C) $(ARCHIVE).cma $(DLL) $(INST) $$extra; \
-		ln -fs $(DLL) $(PREFIX)/stublibs/lib$(ARCHIVE).so;	\
+			$(PACKAGE) $(ARCHIVE).cma lib$(ARCHIVE).a	\
+			$(DLL) $(INST) $$extra; \
 	fi
 
 uninstall:
diff --git a/helm/DEVEL/lablgtkmathview/configure.in b/helm/DEVEL/lablgtkmathview/configure.in
index 7725c0327..61cbcd4a5 100644
--- a/helm/DEVEL/lablgtkmathview/configure.in
+++ b/helm/DEVEL/lablgtkmathview/configure.in
@@ -4,7 +4,7 @@ PACKAGE=lablgtkmathview
 
 LABLGTKMATHVIEW_MAJOR_VERSION=0
 LABLGTKMATHVIEW_MINOR_VERSION=7
-LABLGTKMATHVIEW_MICRO_VERSION=0
+LABLGTKMATHVIEW_MICRO_VERSION=1
 LABLGTKMATHVIEW_VERSION=$LABLGTKMATHVIEW_MAJOR_VERSION.$LABLGTKMATHVIEW_MINOR_VERSION.$LABLGTKMATHVIEW_MICRO_VERSION
 VERSION=$LABLGTKMATHVIEW_VERSION