/[svn]/Makefile.distrib
ViewVC logotype

Diff of /Makefile.distrib

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 671 by abate, Tue Jul 10 17:52:43 2007 UTC revision 672 by abate, Tue Jul 10 17:53:24 2007 UTC
# Line 1  Line 1 
1  include Makefile.conf  include Makefile.conf
2  VERSION = 0.2.0  VERSION = 0.1.2
3    
4  PACKAGES = pxp-engine pxp-lex-iso88591 ulex camlp4 num cgi pcre netstring  PACKAGES = pxp-engine pxp-lex-iso88591 ulex camlp4 num cgi pcre netstring
5  ifeq ($(PXP_WLEX), true)  ifeq ($(PXP_WLEX), true)
# Line 8  Line 8 
8    PACKAGES += pxp-lex-utf8    PACKAGES += pxp-lex-utf8
9  endif  endif
10    
11  ULEX_PATH = `ocamlfind query ulex`  SYNTAX = -I misc/ pa_extend.cmo q_symbol.cmo \
 SYNTAX = camlp4o -I misc/ pa_extend.cmo \  
   q_symbol.cmo \  
   $(shell ocamlfind query ulex)/pa_ulex.cma \  
12    -symbol cduce_version=\"$(VERSION)\" \    -symbol cduce_version=\"$(VERSION)\" \
13    -symbol build_date=\"$(shell date +%Y-%m-%d)\" \    -symbol build_date=\"$(shell date +%Y-%m-%d)\" \
14    -symbol session_dir=\"$(SESSION_DIR)\"    -symbol session_dir=\"$(SESSION_DIR)\"
# Line 27  Line 24 
24          SYNTAX += -symbol EXPAT=          SYNTAX += -symbol EXPAT=
25  endif  endif
26    
27  SYNTAX_PARSER = -pp '$(SYNTAX)'  SYNTAX_PARSER = -syntax camlp4o $(SYNTAX:%=-ppopt %)
28    
29  CAMLC_P = ocamlc  CAMLC_P = ocamlc
30    DEPEND_OCAMLDEP = misc/q_symbol.cmo
31  ifeq ($(PROFILE), true)  ifeq ($(PROFILE), true)
32          CAMLOPT_P = ocamlopt -p          CAMLOPT_P = ocamlopt -p
33          ifeq ($(NATIVE), false)          ifeq ($(NATIVE), false)
34           CAMLC_P = ocamlcp -p a           CAMLC_P = ocamlcp -p a
35           SYNTAX_PARSER =           SYNTAX_PARSER =
36             DEPEND_OCAMLDEP =
37          endif          endif
38  else  else
39          CAMLOPT_P = ocamlopt -inline 25          CAMLOPT_P = ocamlopt -inline 25
# Line 67  Line 66 
66    
67  # Source directories  # Source directories
68    
69  DIRS = misc parser schema typing types runtime driver  DIRS = misc parser schema typing types runtime driver module
70  CLEAN_DIRS = $(DIRS) tools tests  CLEAN_DIRS = $(DIRS) tools tests
71    
72  # Objects to build  # Objects to build
# Line 124  Line 123 
123          $(LINK) $(INCLUDES) -o $@ $^          $(LINK) $(INCLUDES) -o $@ $^
124    
125  .PHONY: compute_depend  .PHONY: compute_depend
126  compute_depend: misc/q_symbol.cmo  compute_depend: $(DEPEND_OCAMLDEP)
127          @echo "Computing dependencies ..."          @echo "Computing dependencies ..."
128          ocamldep $(INCLUDES) $(SYNTAX_PARSER) $(DEPEND) | \          ocamlfind ocamldep -package "$(PACKAGES)" $(INCLUDES) $(SYNTAX_PARSER) $(DEPEND) | \
129          sed -e "s|: |: misc/q_symbol.cmo |" > depend          sed -e "s|: |: misc/q_symbol.cmo |" > depend
130    
 #parser/wlexer.ml: parser/wlexer.mll  
 #       wlex parser/wlexer.mll  
   
131  clean:  clean:
132          for i in $(CLEAN_DIRS); do \          for i in $(CLEAN_DIRS); do \
133          (cd $$i; rm -f *.cmi *.cmo *.cma *.cmx *.o *~); \          (cd $$i; rm -f *.cmi *.cmo *.cma *.cmx *.o *~); \
# Line 151  Line 147 
147          $(CAMLC) -c -pp 'camlp4o pa_extend.cmo q_MLast.cmo' $<          $(CAMLC) -c -pp 'camlp4o pa_extend.cmo q_MLast.cmo' $<
148    
149  .ml.cmo:  .ml.cmo:
150          $(CAMLC) -c $(SYNTAX_PARSER) $(INCLUDES) $<          $(CAMLC) -c $(INCLUDES) $(SYNTAX_PARSER) $<
151    
152  .ml.cmx:  .ml.cmx:
153          $(CAMLOPT) -c $(SYNTAX_PARSER) $(INCLUDES) $<          $(CAMLOPT) -c $(SYNTAX_PARSER) $(INCLUDES) $<
Legend:
Removed from v.671  
changed lines
  Added in v.672
CVS Admin">CVS Admin
 ViewVC Help
Powered by ViewVC 1.1.5