Makefile acceptable. Ready to start packaging.

diff --git a/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/Makefile b/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/Makefile
index 57a3849032a6e566e05ebb94a3cc6d153bc9cd82..009d756d52ed23caae1dd03fcaeddd90af8c2cf3 100644 (file)
--- a/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/Makefile
+++ b/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/Makefile
@@ -6,9 +6,15 @@ MLFLAGS += -I $(LABLGTKDIR) -I $(MINIDOMDIR)
 
 TARGETS = ml_gtk_mathview.o lablgtkmathview.cma
 
-all: $(TARGETS)
+all: Minidom $(TARGETS)
 
-opt: lablgtkmathviewopt
+opt: Minidom.opt lablgtkmathviewopt
+
+Minidom:
+       cd minidom ; make
+
+Minidom.opt:
+       cd minidom ; make opt
 
 configure:
        @rm -f config.make
@@ -95,5 +101,6 @@ ml_gtk.o: $(LABLGTKDIR)/gtk_tags.c $(LABLGTKDIR)/gtk_tags.h \
 
 clean:
        rm -f *.cm* *.o *.a *_tags.[ch] $(TARGETS)
+       cd minidom ; make clean
 
 include .depend

diff --git a/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/minidom/Makefile b/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/minidom/Makefile
index c64b0496bca406a66271a91e8795366dacaa3dd0..db9447feee58f536c34f6eab3769048a5a45cd5c 100644 (file)
--- a/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/minidom/Makefile
+++ b/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/minidom/Makefile
@@ -1,36 +1,35 @@
 
-all: ml_minidom.o minidom.cmi minidom.cmo minidom.cmx test test.opt
+all: test
+
+opt: test.opt
 
 ml_minidom.o: ml_minidom.c
-       gcc -c -I../ -I/usr/lib/ocaml/caml/ `glib-config --cflags` `xml-config --cflags` `gtkmathview-config --cflags` $<
+       gcc -c -I/usr/lib/ocaml/caml/ `glib-config --cflags` `xml-config --cflags` `gtkmathview-config --cflags` $<
 
 minidom.cmi: minidom.mli
        ocamlc -c $<
 
-minidom.cmo: minidom.ml
+minidom.cmo: minidom.ml minidom.cmi
        ocamlc -c $<
 
-minidom.cmx: minidom.ml
+minidom.cmx: minidom.ml minidom.cmi
        ocamlopt -c $<
 
-test.cmo: test.ml
+test.cmo: test.ml minidom.cmo
        ocamlc -c test.ml
 
-test.cmx: test.ml
+test.cmx: test.ml minidom.cmx
        ocamlopt -c test.ml
 
-test: test.cmo minidom.cmi ml_minidom.o
+test: test.cmo minidom.cmo ml_minidom.o
        ocamlc -custom -o test minidom.cmo test.cmo ml_minidom.o \
         -cclib "`xml-config --libs`" -cclib "`glib-config --libs`" \
         -cclib "`gtkmathview-config --libs`"
 
-test.opt: test.cmx minidom.cmi ml_minidom.o
+test.opt: test.cmx minidom.cmx ml_minidom.o
        ocamlopt -o test.opt minidom.cmx test.cmx ml_minidom.o \
         -cclib "`xml-config --libs`" -cclib "`glib-config --libs`" \
         -cclib "`gtkmathview-config --libs`"
 
 clean:
        rm -f *.o *.cm? test test.opt
-
-cleanbak:
-       rm -f *~