This commit was manufactured by cvs2svn to create tag 'V6-2'.

[helm.git] / helm / interface / Makefile

diff --git a/helm/interface/Makefile b/helm/interface/Makefile
index 2b892e2d9fc9bfd6a794c19a0bf1b093df8c1e8c..d2fddf453bf4c6751910f1d402dc31f1217794a0 100644 (file)
--- a/helm/interface/Makefile
+++ b/helm/interface/Makefile
@@ -1,9 +1,10 @@
 LABLGTK_DIR = /usr/lib/ocaml/lablgtk
 LABLGTK_MATHVIEW_DIR = /usr/lib/ocaml/lablgtk/mathview
+MINIDOM_DIR = /usr/lib/ocaml/minidom
 PXP_DIR = /usr/lib/ocaml/site-lib/pxp
 NETSTRING_DIR = /usr/lib/ocaml/site-lib/netstring
-OCAMLC = ocamlc -I $(LABLGTK_DIR) -I $(LABLGTK_MATHVIEW_DIR) -I $(PXP_DIR) -I $(NETSTRING_DIR) -I mlmathview
-OCAMLOPT = ocamlopt -I $(LABLGTK_DIR) -I $(LABLGTK_MATHVIEW_DIR) -I mlgtk_devel -I $(PXP_DIR) -I $(NETSTRING_DIR) -I mlmathview
+OCAMLC = ocamlc -I $(LABLGTK_DIR) -I $(LABLGTK_MATHVIEW_DIR) -I $(PXP_DIR) -I $(NETSTRING_DIR) -I $(MINIDOM_DIR) -I mlmathview
+OCAMLOPT = ocamlopt -I $(LABLGTK_DIR) -I $(LABLGTK_MATHVIEW_DIR) -I mlgtk_devel -I $(PXP_DIR) -I $(NETSTRING_DIR) -I $(MINIDOM_DIR) -I mlmathview
 OCAMLDEP = ocamldep
 
 all: experiment reduction fix_params mmlinterface
@@ -28,7 +29,7 @@ DEPOBJS = experiment.ml cicCache.ml cicCache.mli cicPp.ml cicPp.mli \
           theoryParser.ml theoryParser2.ml theoryPp.ml theoryTypeChecker.ml \
           cicCooking.ml cicCooking.mli cicFindParameters.ml theoryCache.ml \
           fix_params.ml cic2Xml.ml xml.ml uriManager.ml uriManager.mli \
-          cicSubstitution.ml cicSubstitution.mli mml.ml \
+          cicSubstitution.ml cicSubstitution.mli \
           mmlinterface.ml configuration.ml \
           xsltProcessor.ml deannotate.ml cicXPath.ml pxpUriResolver.ml \
           annotationParser.ml annotationParser2.ml annotation2Xml.ml \
@@ -39,7 +40,7 @@ MMLINTERFACEOBJS = configuration.cmo uriManager.cmo getter.cmo cic.cmo \
                    cicParser3.cmo cicParser2.cmo cicParser.cmo deannotate.cmo \
                    cicSubstitution.cmo annotationParser2.cmo \
                    annotationParser.cmo cicCache.cmo cicCooking.cmo cicPp.cmo \
-                   cicReduction.cmo cicTypeChecker.cmo mml.cmo \
+                   cicReduction.cmo cicTypeChecker.cmo \
                    xml.cmo \
                    xsltProcessor.cmo cic2Xml.cmo annotation2Xml.cmo \
                    cicXPath.cmo theory.cmo theoryParser2.cmo theoryParser.cmo \
@@ -52,7 +53,7 @@ MMLINTERFACEOPTOBJS = configuration.cmx uriManager.cmx getter.cmx cic.cmx \
                       deannotate.cmx cicSubstitution.cmx annotationParser2.cmx \
                       annotationParser.cmx cicCache.cmx \
                       cicCooking.cmx cicPp.cmx cicReduction.cmx \
-                      cicTypeChecker.cmx mml.cmx \
+                      cicTypeChecker.cmx \
                       xml.cmx xsltProcessor.cmx \
                       cic2Xml.cmx annotation2Xml.cmx cicXPath.cmx \
                       theory.cmx theoryParser2.cmx theoryParser.cmx \
@@ -105,23 +106,29 @@ depend:
 mmlinterface: $(MMLINTERFACEOBJS)
        $(OCAMLC) -custom -o mmlinterface str.cma unix.cma $(PXPLIBS) dbm.cma \
                   lablgtk.cma gtkInit.cmo \
+                  $(MINIDOM_DIR)/minidom.cmo \
+                  $(MINIDOM_DIR)/ominidom.cmo \
                   $(LABLGTK_MATHVIEW_DIR)/lablgtkmathview.cma \
                   $(MMLINTERFACEOBJS) \
                   -cclib "-lstr -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk \
                   -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm \
-                  -lunix -L/usr/local/lib/gtkmathview -lgtkmathview \
-                  $(LABLGTK_MATHVIEW_DIR)/ml_gtk_mathview.o" \
+                  -lunix `gtkmathview-config --libs` \
+                  $(LABLGTK_MATHVIEW_DIR)/ml_gtk_mathview.o \
+                  $(MINIDOM_DIR)/ml_minidom.o" \
                   -cclib -lmldbm -cclib -lndbm
 
 mmlinterface.opt: $(MMLINTERFACEOPTOBJS)
        $(OCAMLOPT) -o mmlinterface.opt str.cmxa $(PXPLIBSOPT) unix.cmxa \
                     dbm.cmxa lablgtk.cmxa gtkInit.cmx \
+                    $(MINIDOM_DIR)/minidom.cmx \
+                    $(MINIDOM_DIR)/ominidom.cmx \
                     $(LABLGTK_MATHVIEW_DIR)/lablgtkmathview.cmxa \
                     $(MMLINTERFACEOPTOBJS) \
                     -cclib "-lstr -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk \
                     -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm \
-                    -lunix -L/usr/local/lib/gtkmathview -lgtkmathview \
-                    $(LABLGTK_MATHVIEW_DIR)/ml_gtk_mathview.o" \
+                    -lunix `gtkmathview-config --libs` \
+                    $(LABLGTK_MATHVIEW_DIR)/ml_gtk_mathview.o \
+                    $(MINIDOM_DIR)/ml_minidom.o" \
                     -cclib -lmldbm -cclib -lndbm
 
 fix_params: $(FIX_PARAMSOBJS)
@@ -164,17 +171,4 @@ clean:
            reduction.opt fix_params fix_params.opt mmlinterface \
            mmlinterface.opt mmlinterface2 mmlinterface2.opt
 
-start-xaland:
-       java xaland 12345 12346 examples/style/rootcontent.xsl \
-           examples/style/annotatedpres.xsl examples/style/theory_content.xsl \
-           examples/style/theory_pres.xsl
-
-start-xaland3:
-       java xaland 12347 12348 examples/style/rootcontent.xsl \
-           examples/style/annotatedpres.xsl examples/style/theory_content.xsl \
-           examples/style/theory_pres.xsl
-
-start-http-getter:
-       http_getter/http_getter.pl
-
 include .depend