/[svn]/Makefile.distrib

Diff of /Makefile.distrib

Parent Directory | Revision Log | View Patch Patch

-revision 1106 by abate,
Tue Jul 10 18:23:10 2007 UTC
+revision 1174 by abate,
Tue Jul 10 18:28:26 2007 UTC
 Line 8
    PACKAGES += pxp-lex-utf8
  endif
+ # webiface can be made static to be able to move it more easily
+ # (to compile it on a machine which is not the web server)
+ # Seems to be some problems with statically linking curl
+ # EXTRA_OPTS_WEBIFACE = -ccopt -static
  SYNTAX = -I misc/ q_symbol.cmo \
    -symbol cduce_version=\"$(VERSION)\" \
-Line 78
+Line 82
  ifneq ($(ML_INTERFACE), false)
    SYNTAX += -symbol ML_INTERFACE=
    ML_LIB = oCaml_all.$(EXTENSION_LIB)
-   ML_INTERFACE_OBJ = \
+   ML_INTERFACE_OBJ = ocamliface/mltypes.cmo ocamliface/mlstub.cmo
-         cdo2cmo/ml_types.cmo \
-         cdo2cmo/ml_cduce.cmo \
-         cdo2cmo/ml_ocaml.cmo \
-         cdo2cmo/ml_checker.cmo \
-         cdo2cmo/ml_generator.cmo
  else
    ML_INTERFACE_OBJ =
  endif
  INSTALL := $(shell which install)
- all: cduce dtd2cduce validate
+ all: cduce dtd2cduce validate cdo2ml
+ ifneq ($(ML_INTERFACE), false)
+ all: cDuce_all.cma
+ endif
+ ifeq ($(NATIVE),true)
+ all: cDuce_all.cmxa
+ cDuce_all.cma:
+         $(MAKE) NATIVE=false $@
+ endif
- install: all
+ install: all install_lib
          mkdir -p $(BINDIR)
          mkdir -p $(MANDIR)/man1
-         $(INSTALL) -m755 cduce$(EXE) dtd2cduce$(EXE) validate$(EXE) $(BINDIR)/
+         $(INSTALL) -m755 cduce$(EXE) dtd2cduce$(EXE) \
+                          validate$(EXE) cdo2ml$(EXE) $(BINDIR)/
          $(INSTALL) -m644 doc/cduce.1 $(MANDIR)/man1/
          $(INSTALL) -m644 doc/dtd2cduce.1 $(MANDIR)/man1/
          $(INSTALL) -m644 doc/validate.1 $(MANDIR)/man1/
+ install_lib:
+ ifneq ($(ML_INTERFACE), false)
+         @echo "--> Build META"
+         @echo 'version="$(VERSION)"' > META
+         @echo 'requires="$(PACKAGES) camlp4.gramlib"' >> META
+         @echo 'description="Runtime support for CDuce"' >> META
+         @echo 'archive(byte)="oCaml_all.cma,cDuce_all.cma"' >> META
+         @echo 'archive(native)="oCaml_all.cmxa,cDuce_all.cmxa"' >> META
+         -$(OCAMLFIND) remove cduce
+         -$(OCAMLFIND) install cduce META \
+          cDuce_all.cmi oCaml_all.cmi \
+          $(wildcard *.cma) $(wildcard *.cmxa) $(wildcard *.a)
+ endif
  uninstall:
-         rm $(BINDIR)/cduce$(EXE) $(BINDIR)/dtd2cduce$(EXE) $(BINDIR)/validate$(EXE)
+         rm -f $(BINDIR)/cduce$(EXE) $(BINDIR)/dtd2cduce$(EXE) \
-         rm $(MANDIR)/man1/cduce.1 $(MANDIR)/man1/dtd2cduce.1 $(MANDIR)/man1/validate.1
+           $(BINDIR)/validate$(EXE) $(BINDIR)/cdo2ml$(EXE)
+         rm -f $(MANDIR)/man1/cduce.1 $(MANDIR)/man1/dtd2cduce.1 \
+           $(MANDIR)/man1/validate.1
+         ocamlfind remove cduce
  help:
          @echo "GOALS"
-Line 120
+Line 147
  # Source directories
- DIRS = misc parser schema typing types compile runtime driver query cdo2cmo
+ DIRS = misc parser schema typing types compile runtime driver query ocamliface
- CLEAN_DIRS = $(DIRS) tools tests
+ CLEAN_DIRS = $(DIRS) cdo2cmo tools tests
  # Objects to build
-Line 139
+Line 166
   \
   compile/lambda.cmo \
   runtime/value.cmo \
+  types/externals.cmo \
   \
   schema/schema_types.cmo \
   schema/schema_xml.cmo \
-Line 177
+Line 205
   $(CQL_OBJECTS_RUN)
  ALL_INTERFACES = schema/schema_types.mli
+ ifneq ($(ML_INTERFACE), false)
+   ALL_INTERFACES += ocamliface/mltypes.mli ocamliface/mlstub.mli
+ endif
  DEPEND = $(ALL_OBJECTS:.cmo=.ml) $(ALL_OBJECTS:.cmo=.mli) $(ALL_INTERFACES)
  INCLUDES = $(DIRS:%=-I %)
-Line 193
+Line 225
  cDuce_all.$(EXTENSION_LIB): $(OBJECTS:.cmo=.$(EXTENSION))
-         $(COMPILE) -o cDuce_all.$(EXTENSION) -pack $^
+         @echo "--> Build $@"
-         $(LINK) -a -o $@ cDuce_all.$(EXTENSION)
+         @$(COMPILE) -o cDuce_all.$(EXTENSION) -pack $^
-         $(COMPILE) -c cdo2cmo/cdml.mli
+         @$(COMPILE) -a -o $@ cDuce_all.$(EXTENSION)
-         $(COMPILE) -c -o cdml.$(EXTENSION) cdo2cmo/cdml.ml
-         $(LINK) -a -o cdo2cmo/cdml.$(EXTENSION_LIB) \
-                 oCaml_all.$(EXTENSION_LIB) \
-                 cDuce_all.$(EXTENSION_LIB) \
-                 cdo2cmo/cdml.$(EXTENSION)
  oCaml_all.$(EXTENSION_LIB):
          cd cdo2cmo; $(MAKE) PREFIX=$(ML_MODULES) MODEL=$(ML_INTERFACE) $@
  webiface: $(WEBIFACE:.cmo=.$(EXTENSION))
-         $(LINK) -verbose $(INCLUDES) -o $@ $^ -ccopt -static
+         $(LINK) -verbose $(INCLUDES) -o $@ $(ML_LIB) $^ $(EXTRA_OPTS_WEBIFACE)
- # webiface is made static to be able to move it more easily
- # (to compile it on a machine which is not the web server)
  dtd2cduce: $(DTD2CDUCE:.cmo=.$(EXTENSION))
          $(LINK) $(INCLUDES) -o $@ $^
-Line 216
+Line 242
  validate: $(VALIDATE_OBJECTS:.cmo=.$(EXTENSION)) tools/validate.$(EXTENSION)
          $(LINK) $(INCLUDES) -o $@ $^
+ cdo2ml: ocamliface/cdo2ml.ml
+         ocamlc -o $@ -pp camlp4o -I +camlp4 camlp4.cma pr_o.cmo $^
  .PHONY: compute_depend
  compute_depend: $(DEPEND_OCAMLDEP)
          echo $(DEPEND)
-Line 228
+Line 257
          done
          (cd expat; $(MAKE) clean)
          rm -f `find . -name "*~"`
-         rm -f *.cmi *.cmo *.cma *.cmx *.a *.cmxa *.o *~
+         rm -f *.cmi *.cmo *.cma *.cmx *.a *.cmxa *.o *~ META
-         rm -f cduce ocamlprof.dump
+         rm -f cduce$(EXE) ocamlprof.dump
-         rm -f dtd2cduce pool webiface validate
+         rm -f dtd2cduce$(EXE) webiface$(EXE) validate$(EXE) cdo2ml$(EXE)
          rm -Rf prepro package
          rm -f web/www/*.html web/*~
          rm -f web/*.cdo
-Line 241
+Line 270
  $(ML_INTERFACE_OBJ:.cmo=.$(EXTENSION)): oCaml_all.$(EXTENSION_LIB)
  $(ALL_OBJECTS:.cmo=.$(EXTENSION)): misc/q_symbol.cmo
- $(ALL_INTERFACE): misc/q_symbol.cmo
+ $(ALL_INTERFACES): misc/q_symbol.cmo
  .SUFFIXES: .ml .mli .cmo .cmi .cmx

 Legend:



Removed from v.1106
 


changed lines


 
Added in v.1174
 Legend:



Removed from v.1106
 


changed lines


 
Added in v.1174
-Removed from v.1106
+Added in v.1174

CVS Admin">CVS Admin	ViewVC Help
Powered by ViewVC 1.1.5