/[svn]/cduce/trunk/Makefile.distrib

Diff of /cduce/trunk/Makefile.distrib

Parent Directory | Revision Log | View Patch Patch

-Makefile.distrib
revision 1628 by abate,
Tue Jul 10 19:09:24 2007 UTC
+cduce/trunk/Makefile.distrib
revision 1956 by abate,
Wed Jul 11 13:01:15 2007 UTC
 Line 1
+ default: cduce
  include Makefile.conf
- VERSION = 0.3.2
+ include VERSION
  ALL_TARGET=cduce cduce_lib.cma
  INSTALL_BINARIES=cduce$(EXE)
  ifneq ($(ML_INTERFACE), false)
-   ALL_TARGET += cdo2ml mlcduce_wrapper
+   INSTALL_BINARIES += cduce_mktop
-   INSTALL_BINARIES += cdo2ml$(EXE) mlcduce_wrapper$(EXE) cduce_mktop
  endif
- all: $(ALL_TARGET)
  ifeq ($(NATIVE),true)
  all: cduce_lib.cmxa
  endif
- PACKAGES = ulex camlp4 cgi pcre num netstring
+ PACKAGES = camlp4 ulex pcre num netstring cgi
  # Call make with VERBOSE=true to get a trace of commands
-Line 31
+Line 32
  SYNTAX = -I misc/ q_symbol.cmo \
    -symbol cduce_version=\"$(VERSION)\" \
    -symbol build_date=\"$(shell date +%Y-%m-%d)\" \
-   -symbol session_dir=\"$(SESSION_DIR)\"
+   -symbol session_dir=\"$(SESSION_DIR)\" \
+   -loc "_loc"
  SYNTAX_PARSER = -syntax camlp4o $(SYNTAX:%=-ppopt %)
  CAMLC_P = ocamlc -g
  DEPEND_OCAMLDEP = misc/q_symbol.cmo
  ifeq ($(PROFILE), true)
-   CAMLOPT_P = ocamlopt -p
+   CAMLOPT_P = ocamlopt -p -inline 10000
    ifeq ($(NATIVE), false)
      CAMLC_P = ocamlcp -p a
      SYNTAX_PARSER =
      DEPEND_OCAMLDEP =
    endif
  else
-   CAMLOPT_P = ocamlopt -inline 25
+   CAMLOPT_P = ocamlopt -inline 10000
  endif
- OPT = -warn-error FPS
+ OPT = -warn-error FPSXY
  ANNOT =
  INTERFACE =
  ifeq ($(ANNOT), true)
-Line 66
+Line 68
    EXTENSION_LIB = cmxa
    CAML=ocamlopt
    COMPILE = $(CAMLOPT)
-   LINK = $(CAMLOPT) -linkpkg gramlib.cmxa
+   LINK = $(CAMLOPT) -linkpkg
+   ifeq ($(NATDYNLINK), true)
+     LINK += dynlink.cmxa
+   endif
+   LINK += camlp4lib.cmxa
    SYNTAX += -symbol ocaml_compiler=\"native\"
  else
    EXTENSION = cmo
    EXTENSION_LIB = cma
    COMPILE = $(CAMLC)
    CAML=ocamlc
-   LINK = $(CAMLC) -custom -linkpkg gramlib.cma
+   LINK = $(CAMLC) -custom -linkpkg camlp4lib.cma
    SYNTAX += -symbol ocaml_compiler=\"bytecode\"
  endif
+ ifeq ($(FORPACK),true)
+   FORPACKOPT=-passopt -for-pack -passopt Cduce_lib
+ else
+   FORPACKOPT=
+ endif
- INSTALL := install
+ INSTALL := install -c
  ifeq ($(NATIVE),true)
  .PHONY: cduce_lib.cma
-Line 103
+Line 114
  uninstall:
-         rm -f $(BINDIR)/cduce$(EXE) \
+         rm -f $(BINDIR)/cduce$(EXE) $(BINDIR)/cduce_mktop
-           $(BINDIR)/cdo2ml$(EXE) \
+         rm -f $(MANDIR)/man1/cduce.1
-           $(BINDIR)/mlcduce_wrapper$(EXE) $(BINDIR)/cduce_mktop
-         rm -f $(MANDIR)/man1/cduce.1 \
-           $(MANDIR)/man1/cdo2ml.1
          rm -Rf $(DOCDIR)
          ocamlfind remove cduce
-Line 124
+Line 132
  # Source directories
  DIRS = misc parser schema typing types compile runtime driver query ocamliface
- CLEAN_DIRS = $(DIRS) cdo2cmo tools tests
+ CLEAN_DIRS = $(DIRS) tools tests
  # Objects to build
- SCHEMA_OBJS = \
-  schema/schema_pcre.cmo \
-  schema/schema_types.cmo \
-  schema/schema_xml.cmo \
-  schema/schema_common.cmo \
-  schema/schema_builtin.cmo \
-  schema/schema_validator.cmo \
-  schema/schema_parser.cmo \
-  schema/schema_converter.cmo
  OBJECTS = \
-  driver/config.cmo \
+  driver/cduce_config.cmo misc/stats.cmo misc/custom.cmo misc/encodings.cmo \
-  misc/stats.cmo \
+  misc/upool.cmo misc/pretty.cmo misc/ns.cmo misc/imap.cmo misc/html.cmo \
-  misc/serialize.cmo misc/custom.cmo \
-  misc/state.cmo misc/pool.cmo misc/encodings.cmo misc/bool.cmo \
-  misc/pretty.cmo misc/ns.cmo misc/inttbl.cmo misc/imap.cmo \
-  misc/html.cmo \
   \
-  types/sortedList.cmo types/boolean.cmo types/ident.cmo \
+  types/compunit.cmo types/sortedList.cmo misc/bool.cmo types/ident.cmo \
-  types/intervals.cmo \
+  types/intervals.cmo types/chars.cmo types/atoms.cmo types/normal.cmo \
-  types/chars.cmo types/atoms.cmo \
+  types/types.cmo compile/auto_pat.cmo \
-  types/normal.cmo \
+  types/sequence.cmo types/builtin_defs.cmo \
-  types/types.cmo types/sample.cmo types/sequence.cmo types/patterns.cmo \
-  types/builtin_defs.cmo \
   \
-  compile/lambda.cmo \
   runtime/value.cmo \
   \
-  parser/location.cmo  parser/url.cmo \
+  schema/schema_pcre.cmo schema/schema_types.cmo \
+  schema/schema_xml.cmo schema/schema_common.cmo \
+  schema/schema_builtin.cmo schema/schema_validator.cmo \
    \
-  parser/ulexer.cmo parser/ast.cmo parser/parser.cmo \
+  types/patterns.cmo \
+  compile/print_auto.cmo \
   \
-  types/externals.cmo \
+  compile/lambda.cmo \
-  typing/typed.cmo typing/typer.cmo \
+  runtime/run_dispatch.cmo runtime/explain.cmo runtime/eval.cmo \
   \
-  $(SCHEMA_OBJS) \
+  parser/cduce_loc.cmo  parser/url.cmo \
+  parser/ulexer.cmo parser/ast.cmo parser/parser.cmo \
   \
-  runtime/load_xml.cmo runtime/run_dispatch.cmo \
+  typing/typed.cmo typing/typepat.cmo types/externals.cmo typing/typer.cmo \
-  runtime/explain.cmo \
-  runtime/print_xml.cmo runtime/eval.cmo \
   compile/compile.cmo \
-  compile/operators.cmo \
   \
-  types/builtin.cmo \
+  schema/schema_parser.cmo schema/schema_converter.cmo \
-  driver/librarian.cmo \
+  runtime/load_xml.cmo runtime/print_xml.cmo compile/operators.cmo types/builtin.cmo \
+  driver/librarian.cmo types/sample.cmo \
   driver/cduce.cmo \
-  runtime/system.cmo
+  \
+  runtime/system.cmo query/query_aggregates.cmo
  schema/schema_types.ml: schema/schema_types.mli
          cp $^ $@
+ compile/auto_pat.ml: compile/auto_pat.mli
+         cp $^ $@
+ compile/lambda.ml: compile/lambda.mli
+         cp $^ $@
  ML_INTERFACE_OBJS = \
    ocamliface/caml_cduce.cmo \
-Line 206
+Line 204
  ifeq ($(PXP),true)
    OBJECTS += runtime/cduce_pxp.cmo
    PACKAGES += $(PXP_PACK)
+   ALL_TARGET += dtd2cduce
+   INSTALL_BINARIES += dtd2cduce
  endif
  ifeq ($(EXPAT), true)
    OBJECTS += runtime/cduce_expat.cmo
 Line 213
  endif
- #CQL_OBJECTS= query/query_aggregates.cmo query/query.cmo query/query_parse.cmo
+ all: $(ALL_TARGET)
- #CQL_OBJECTS_RUN = query/query_run.cmo
- CQL_OBJECTS= query/query_aggregates.cmo
- CQL_OBJECTS_RUN=
- OBJECTS += $(CQL_OBJECTS)
- VALIDATE_OBJECTS := $(shell for o in $(OBJECTS); do echo $$o; if [ "$$o" = "schema/schema_parser.cmo" ]; then exit 0; fi; done) # all objects until schema_parser.cmo
- OBJECTS += $(CQL_OBJECTS_RUN)
  OBJECTS += driver/run.cmo
  CDUCE = $(OBJECTS) driver/start.cmo
-Line 239
+Line 231
  DEPEND = $(ALL_OBJECTS:.cmo=.ml) $(ALL_OBJECTS:.cmo=.mli) $(ALL_INTERFACES)
  INCLUDES = $(DIRS:%=-I %)
+ # -I +camlp4
  cduce: $(CDUCE:.cmo=.$(EXTENSION))
          @echo "Build $@"
-Line 254
+Line 247
  cduce_lib.$(EXTENSION_LIB): $(OBJECTS:.cmo=.$(EXTENSION))
          @echo "Pack cduce_lib.$(EXTENSION)"
-         $(HIDE)$(COMPILE) -o cduce_lib.$(EXTENSION) -pack $^
+         $(HIDE)$(COMPILE) -o cduce_lib.$(EXTENSION) $(INCLUDES) -pack $^
          @echo "Build $@"
          $(HIDE)$(COMPILE) -a -o $@ cduce_lib.$(EXTENSION)
  dtd2cduce: tools/dtd2cduce.ml
          @echo "Build $@"
-         $(HIDE)$(OCAMLFIND) $(CAML) -o $@ -ccopt -static -package "$(PXP_PACK) cgi" -linkpkg $^
+         $(HIDE)$(OCAMLFIND) $(CAML) -o $@ -package "$(PXP_PACK) cgi" -linkpkg $^
- cduce_validate: $(VALIDATE_OBJECTS:.cmo=.$(EXTENSION)) tools/validate.$(EXTENSION)
-         @echo "Build $@"
-         $(HIDE)$(LINK) $(INCLUDES) -o $@ $^
- mlcduce_wrapper: $(OBJECTS) ocamliface/mlcduce_wrapper.ml
-         @echo "Build $@"
-         $(HIDE)$(CAMLC) -linkpkg $(INCLUDES) -o $@ odyl.cma camlp4.cma pr_o.cmo $^ $(EXTRA_LINK_OPTS)
- cdo2ml: ocamliface/cdo2ml.ml
-         @echo "Build $@"
-         $(HIDE)ocamlc -o $@ -pp camlp4o -I +camlp4 odyl.cma camlp4.cma pr_o.cmo $^
  .PHONY: compute_depend
  compute_depend: $(DEPEND_OCAMLDEP)
-         echo $(DEPEND)
          @echo "Computing dependencies ..."
          ocamlfind ocamldep -package "$(PACKAGES)" \
                  $(INCLUDES) $(SYNTAX_PARSER) $(DEPEND) > depend
-Line 284
+Line 264
          for i in $(CLEAN_DIRS); do \
          (cd $$i; rm -f *.cmi *.cmo *.cma *.cmx *.o *.a *.cmxa *~); \
          done
-         rm -f ocamliface/cmi2ml ocamliface/asttypes.ml
+         (cd ocamliface; $(MAKE) clean)
          rm -f `find . -name "*~"`
          rm -f *.cmi *.cmo *.cma *.cmx *.a *.cmxa *.o *~ META
          rm -f cduce$(EXE) ocamlprof.dump
-         rm -f dtd2cduce$(EXE) webiface$(EXE) cduce_validate$(EXE) \
+         rm -f dtd2cduce$(EXE) webiface$(EXE) evaluator$(EXE)
-                 cdo2ml$(EXE) mlcduce_wrapper$(EXE) evaluator$(EXE)
          rm -Rf prepro package
          rm -f web/www/*.html web/*~
          rm -f web/*.cdo
-Line 309
+Line 288
  misc/q_symbol.cmo: misc/q_symbol.ml
          @echo "Build $@"
-         $(HIDE)$(CAMLC) -c -pp 'camlp4o pa_extend.cmo q_MLast.cmo' $<
+         $(HIDE)$(CAMLC) -c -pp camlp4orf $<
  .ml.cmo:
          @echo "Build $@"
-Line 317
+Line 296
  .ml.cmx:
          @echo "Build $@"
-         $(HIDE)$(CAMLOPT) -c $(SYNTAX_PARSER) $(INCLUDES) $<
+         $(HIDE)$(CAMLOPT) $(FORPACKOPT) -c $(SYNTAX_PARSER) $(INCLUDES) $<
  .mli.cmi:
          @echo "Build $@"
-Line 331
+Line 310
          mkdir -p web/doc
          (cd web; ../cduce --run site.cdo --arg doc.xml -o doc)
- web/site.cdo: cduce web/xhtml.cdo web/site.cd
+ web/site.cdo: cduce web/xhtml.cdo web/site.cd web/siteTypes.cd
          ./cduce -I web/ --compile web/site.cd
  web/xhtml.cdo: cduce web/xhtml.cd
-Line 339
+Line 318
  install_doc: doc
          $(HIDE)mkdir -p $(MANDIR)/man1
-         $(HIDE)(cd doc; $(MAKE) install INSTALL=$(INSTALL) MANDIR=$(MANDIR) HIDE=$(HIDE))
+         $(HIDE)(cd doc; $(MAKE) install INSTALL="$(INSTALL)" MANDIR=$(MANDIR) HIDE=$(HIDE))
          mkdir -p $(DOCDIR)/img
          cp web/doc/*.html $(DOCDIR)/
          cp CHANGES INSTALL INSTALL.WIN32 README AUTHORS LICENSE $(DOCDIR)/
-Line 351
+Line 330
  ocamliface/caml_cduce.cmo:
          @cd ocamliface; \
-         $(MAKE) PREFIX=$(ML_MODULES) MODEL=$(ML_INTERFACE) \
+         $(MAKE) caml_cduce.cmo
-                 HIDE=$(HIDE) caml_cduce.cmo
  ocamliface/caml_cduce.cmx:
          @cd ocamliface; \
-         $(MAKE) PREFIX=$(ML_MODULES) MODEL=$(ML_INTERFACE) \
+         $(MAKE) caml_cduce.cmx
-                 HIDE=$(HIDE) caml_cduce.cmx

 Legend:



Removed from v.1628
 


changed lines


 
Added in v.1956
 Legend:



Removed from v.1628
 


changed lines


 
Added in v.1956
-Removed from v.1628
+Added in v.1956

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