X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Flablgtkmathview%2FMakefile.in;h=61d4a106dd60122f8299cd5c0b32ce35de773429;hb=77994a44a78f2a0a510296bdc2ec8c9cf882b222;hp=9621af74384c2a81a18cdf4f8d9cff21657ca8aa;hpb=b2d90f84d53896b5b195e168ac2c6ba4416245d5;p=helm.git

diff --git a/helm/DEVEL/lablgtkmathview/Makefile.in b/helm/DEVEL/lablgtkmathview/Makefile.in
index 9621af743..61d4a106d 100644
--- a/helm/DEVEL/lablgtkmathview/Makefile.in
+++ b/helm/DEVEL/lablgtkmathview/Makefile.in
@@ -5,12 +5,12 @@ PREFIX =
 OBJECTS_C = ml_gtk_mathview.o
 OBJECTS =  gtk_mathview.cmo gtkMathView.cmo gMathView.cmo
 OBJECTS_OPT = gtkMathView.cmx gtk_mathview.cmx gMathView.cmx
-INST = META gMathView.cmi gtkMathView.cmi gtk_mathview.cmi
+INST = META gMathView.mli gMathView.cmi gtkMathView.cmi gtk_mathview.cmi
 DIST_FILES = \
   AUTHORS COPYING ChangeLog LICENSE Makefile.in NEWS README \
-  configure.in gMathView.ml gtkMathView.ml gtk_mathview.ml \
-  ml_gtk_mathview.c META.in .depend debian/ test/ configure \
-  lablgtkmathview.spec lablgtkmathview.spec.in
+  configure.in gMathView.ml gMathView.mli gtkMathView.ml \
+  gtk_mathview.ml ml_gtk_mathview.c META.in .depend debian/ test/ \
+  configure lablgtkmathview.spec lablgtkmathview.spec.in
 DOC_FILES = AUTHORS COPYING ChangeLog NEWS README
 REQUIRES = gdome2 lablgtk
 PREDICATES =
@@ -29,8 +29,7 @@ TESTDIR = ./test
 TMPDIR = .test
 TMPPKGDIR = $(TMPDIR)/$(PACKAGE)
 
-# all: $(ARCHIVE) $(ARCHIVE_SO) $(TESTDIR)/test
-all: $(ARCHIVE) $(ARCHIVE_SO)
+all: $(ARCHIVE) $(ARCHIVE_SO) $(TESTDIR)/test
 
 opt: $(OBJECTS_C) $(ARCHIVE_OPT) $(ARCHIVE_A) $(ARCHIVE_SO) #$(TESTDIR)/test.opt
 
@@ -42,7 +41,7 @@ dist:
 	rm -rf $(PACKAGE)-$(VERSION)
 
 ml_gtk_mathview.o: ml_gtk_mathview.c
-	gcc -c -I$(INCLUDEDIR) `ocamlfind query -i-format lablgtk` `glib-config --cflags` `gtk-config --cflags` `gtkmathview-config --cflags` `gdome-config --cflags` `ocamlfind query -i-format gdome2` $<
+	gcc -c -I$(INCLUDEDIR) -fPIC `ocamlfind query -i-format lablgtk` `glib-config --cflags` `gtk-config --cflags` `gtkmathview-config --cflags` `gdome-config --cflags` `ocamlfind query -i-format gdome2` $<
 
 .SUFFIXES: .cmo .cmi .cmx .ml .mli
 
@@ -65,11 +64,10 @@ $(ARCHIVE): $(OBJECTS) $(ARCHIVE_SO)
         -predicates "$(PREDICATES)" -o $@ $^ \
         -cclib "`glib-config --libs` `gdome-config --libs` `gtkmathview-config --libs`" -dllib -l$(PACKAGE)
 $(ARCHIVE_OPT) $(ARCHIVE_A): $(OBJECTS_OPT)
-	INSTPATH=`ocamlfind query gdome2` ; \
 	$(OCAMLOPT) -a -package "$(REQUIRES)" \
         -predicates "$(PREDICATES)" -o $@ $^ \
         -cclib "`glib-config --libs` `gdome-config --libs` `gtkmathview-config --libs`" \
-        -cclib "`echo $$INSTPATH | sed "s/\\(.*\\)\\/gdome2/\\1/"`/$(PACKAGE)/$(ARCHIVE_SO)"
+		-cclib "@OCAML_LIB_DIR@/stublibs/$(ARCHIVE_SO)"
 
 $(ARCHIVE_SO): $(OBJECTS_C)
 	gcc -shared -o $@ $< `gtkmathview-config --libs` -lmlgdome -L `ocamlfind query gdome2` -Xlinker -rpath -Xlinker `ocamlfind query gdome2`