ocaml 3.09 transition

[helm.git] / helm / DEVEL / lablgtkmathview / Makefile.in

diff --git a/helm/DEVEL/lablgtkmathview/Makefile.in b/helm/DEVEL/lablgtkmathview/Makefile.in
index 38846e83f18ae702e28b6c4d3166bbeba2aaa703..26532c4a8f30ad04cbff1bf73d34b7cd91bfd79d 100644 (file)
--- a/helm/DEVEL/lablgtkmathview/Makefile.in
+++ b/helm/DEVEL/lablgtkmathview/Makefile.in
@@ -1,25 +1,34 @@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 INCLUDEDIR = @OCAML_INCLUDE_DIR@
-PROPCC = /home/luca/builds/lablgtk2/src/propcc
+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       \
-       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 \
   gtk_mathview.ml ml_gtk_mathview.c META.in .depend debian/ test/ \
-  configure lablgtkmathview.spec lablgtkmathview.spec.in
+  configure gtkMathView.props
 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
@@ -35,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
@@ -59,7 +68,7 @@ deb: dist
 $(GENERATED_FILES): gtkMathView.props
 
 ml_gtk_mathview.o: ml_gtk_mathview.c
-       gcc -c -I$(INCLUDEDIR) -fPIC `ocamlfind query -i-format lablgtk` @GTKMATHVIEW_CFLAGS@ @GDOME_CFLAGS@ `ocamlfind query -i-format gdome2` $<
+       gcc -c -I$(INCLUDEDIR) -fPIC `ocamlfind query -i-format lablgtk2` @GTKMATHVIEW_CFLAGS@ @GDOME_CFLAGS@ `ocamlfind query -i-format gdome2` $<
 
 .SUFFIXES: .cmo .cmi .cmx .ml .mli
 
@@ -77,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)
@@ -95,15 +106,15 @@ $(TESTDIR)/test.opt: $(OBJECTS_C) $(ARCHIVE).a $(ARCHIVE).cmxa $(TESTDIR)/test.m
        rm -r $(TMPDIR)
 
 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;        \
-       else \
-               $(OCAMLFIND) install -destdir $(PREFIX) \
-                       $(PACKAGE) $(OBJECTS_C) $(ARCHIVE).cma $(DLL) $(INST) $$extra; \
-               ln -fs $(DLL) $(PREFIX)/stublibs/lib$(ARCHIVE).so;      \
+       test ! -f $(ARCHIVE).cmxa || extra="$(ARCHIVE).a $(ARCHIVE).cmxa" ;     \
+       if [ "$(PREFIX)" = "" ]; then                                           \
+               $(OCAMLFIND) install                                            \
+                       $(PACKAGE) $(ARCHIVE).cma lib$(ARCHIVE).a               \
+                       $(DLL) $(INST) $$extra;                                 \
+       else                                                                    \
+               $(OCAMLFIND) install -ldconf /def/null -destdir $(PREFIX)       \
+                       $(PACKAGE) $(ARCHIVE).cma lib$(ARCHIVE).a               \
+                       $(DLL) $(INST) $$extra;                                 \
        fi
 
 uninstall:
@@ -119,5 +130,5 @@ clean:
        rm -rf $(TMPDIR)
 
 distclean: clean
-       rm -f config.log config.cache config.status Makefile META lablgtkmathview.spec
+       rm -f config.log config.cache config.status Makefile META
        cd $(TESTDIR) ; make distclean