Added preprocessing, cleaned up slightly.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@5231 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
d46db88c4d
commit
78fd2cb821
1 changed files with 26 additions and 36 deletions
|
|
@ -542,18 +542,24 @@ OCAMLDLGEN=@OCAMLDLGEN@
|
||||||
OCAMLFIND=@OCAMLFIND@
|
OCAMLFIND=@OCAMLFIND@
|
||||||
OCAMLMKTOP=@OCAMLMKTOP@ $(SWIGWHERE)
|
OCAMLMKTOP=@OCAMLMKTOP@ $(SWIGWHERE)
|
||||||
NOLINK ?= false
|
NOLINK ?= false
|
||||||
|
OCAMLPP= -pp "camlp4o ./swigp4.cmo"
|
||||||
|
OCAMLCORE=\
|
||||||
|
$(SWIG) -ocaml -co swig.mli ; \
|
||||||
|
$(SWIG) -ocaml -co swig.ml ; \
|
||||||
|
$(SWIG) -ocaml -co swigp4.ml ; \
|
||||||
|
$(OCC) -c swig.mli ; \
|
||||||
|
$(OCC) -c swig.ml ; \
|
||||||
|
$(OCC) -I `camlp4 -where` -pp "camlp4o pa_extend.cmo q_MLast.cmo" \
|
||||||
|
-c swigp4.ml
|
||||||
|
|
||||||
ocaml_static: $(SRCS)
|
ocaml_static: $(SRCS)
|
||||||
$(SWIG) -ocaml -co swig.mli
|
$(OCAMLCORE)
|
||||||
$(SWIG) -ocaml -co swig.ml
|
|
||||||
$(OCC) -c swig.mli
|
|
||||||
$(OCC) -c swig.ml
|
|
||||||
$(SWIG) -ocaml $(SWIGOPT) $(INTERFACE)
|
$(SWIG) -ocaml $(SWIGOPT) $(INTERFACE)
|
||||||
$(OCC) -g -c -ccopt -g -ccopt "$(INCLUDES)" $(ISRCS) $(SRCS)
|
$(OCC) -g -c -ccopt -g -ccopt "$(INCLUDES)" $(ISRCS) $(SRCS)
|
||||||
$(OCC) -g -c $(INTERFACE:%.i=%.mli)
|
$(OCC) -g -c $(INTERFACE:%.i=%.mli)
|
||||||
$(OCC) -g -c $(INTERFACE:%.i=%.ml)
|
$(OCC) -g -c $(INTERFACE:%.i=%.ml)
|
||||||
test -z "$(PROGFILE)" || test -f "$(PROGFILE)" && \
|
test -z "$(PROGFILE)" || test -f "$(PROGFILE)" && \
|
||||||
$(OCC) -c $(PROGFILE)
|
$(OCC) $(OCAMLPP) -c $(PROGFILE)
|
||||||
$(NOLINK) || $(OCC) -g -ccopt -g -cclib -g -custom -o $(TARGET) \
|
$(NOLINK) || $(OCC) -g -ccopt -g -cclib -g -custom -o $(TARGET) \
|
||||||
swig.cmo \
|
swig.cmo \
|
||||||
$(INTERFACE:%.i=%.cmo) \
|
$(INTERFACE:%.i=%.cmo) \
|
||||||
|
|
@ -561,10 +567,7 @@ ocaml_static: $(SRCS)
|
||||||
$(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)"
|
$(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)"
|
||||||
|
|
||||||
ocaml_dynamic: $(SRCS)
|
ocaml_dynamic: $(SRCS)
|
||||||
$(SWIG) -ocaml -co swig.mli
|
$(OCAMLCORE)
|
||||||
$(SWIG) -ocaml -co swig.ml
|
|
||||||
$(OCC) -c swig.mli
|
|
||||||
$(OCC) -c swig.ml
|
|
||||||
$(SWIG) -ocaml $(SWIGOPT) $(INTERFACE)
|
$(SWIG) -ocaml $(SWIGOPT) $(INTERFACE)
|
||||||
$(OCC) -g -c -ccopt -g -ccopt "$(INCLUDES)" $(ISRCS) $(SRCS)
|
$(OCC) -g -c -ccopt -g -ccopt "$(INCLUDES)" $(ISRCS) $(SRCS)
|
||||||
$(CXXSHARED) $(CCSHARED) $(CFLAGS) -o $(INTERFACE:%.i=%@SO@) \
|
$(CXXSHARED) $(CCSHARED) $(CFLAGS) -o $(INTERFACE:%.i=%@SO@) \
|
||||||
|
|
@ -575,7 +578,7 @@ ocaml_dynamic: $(SRCS)
|
||||||
rm $(INTERFACE:%.i=%.mli)
|
rm $(INTERFACE:%.i=%.mli)
|
||||||
$(OCAMLFIND) $(OCC) -g -c -package dl $(INTERFACE:%.i=%.ml)
|
$(OCAMLFIND) $(OCC) -g -c -package dl $(INTERFACE:%.i=%.ml)
|
||||||
test -z "$(PROGFILE)" || test -f "$(PROGFILE)" && \
|
test -z "$(PROGFILE)" || test -f "$(PROGFILE)" && \
|
||||||
$(OCC) -c $(PROGFILE)
|
$(OCC) $(OCAMLPP) -c $(PROGFILE)
|
||||||
$(NOLINK) || $(OCAMLFIND) \
|
$(NOLINK) || $(OCAMLFIND) \
|
||||||
$(OCC) -g -ccopt -g -cclib -g -custom -o $(TARGET) \
|
$(OCC) -g -ccopt -g -cclib -g -custom -o $(TARGET) \
|
||||||
swig.cmo \
|
swig.cmo \
|
||||||
|
|
@ -583,27 +586,22 @@ ocaml_dynamic: $(SRCS)
|
||||||
$(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo)
|
$(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo)
|
||||||
|
|
||||||
ocaml_static_toplevel: $(SRCS)
|
ocaml_static_toplevel: $(SRCS)
|
||||||
$(SWIG) -ocaml -co swig.mli
|
$(OCAMLCORE)
|
||||||
$(SWIG) -ocaml -co swig.ml
|
|
||||||
$(OCC) -c swig.mli
|
|
||||||
$(OCC) -c swig.ml
|
|
||||||
$(SWIG) -ocaml $(SWIGOPT) $(INTERFACE)
|
$(SWIG) -ocaml $(SWIGOPT) $(INTERFACE)
|
||||||
$(OCC) -g -c -ccopt -g -ccopt "$(INCLUDES)" $(ISRCS) $(SRCS)
|
$(OCC) -g -c -ccopt -g -ccopt "$(INCLUDES)" $(ISRCS) $(SRCS)
|
||||||
$(OCC) -g -c $(INTERFACE:%.i=%.mli)
|
$(OCC) -g -c $(INTERFACE:%.i=%.mli)
|
||||||
$(OCC) -g -c $(INTERFACE:%.i=%.ml)
|
$(OCC) -g -c $(INTERFACE:%.i=%.ml)
|
||||||
test -z "$(PROGFILE)" || test -f "$(PROGFILE)" && \
|
test -z "$(PROGFILE)" || test -f "$(PROGFILE)" && \
|
||||||
$(OCC) -c $(PROGFILE)
|
$(OCC) $(OCAMLPP) -c $(PROGFILE)
|
||||||
$(NOLINK) || $(OCAMLMKTOP) \
|
$(NOLINK) || $(OCAMLMKTOP) \
|
||||||
swig.cmo \
|
swig.cmo \
|
||||||
|
-I `camlp4 -where` camlp4o.cma swigp4.cmo \
|
||||||
-g -ccopt -g -cclib -g -custom -o $(TARGET)_top \
|
-g -ccopt -g -cclib -g -custom -o $(TARGET)_top \
|
||||||
$(INTERFACE:%.i=%.cmo) \
|
$(INTERFACE:%.i=%.cmo) \
|
||||||
$(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)"
|
$(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)"
|
||||||
|
|
||||||
ocaml_static_cpp: $(SRCS)
|
ocaml_static_cpp: $(SRCS)
|
||||||
$(SWIG) -ocaml -co swig.mli
|
$(OCAMLCORE)
|
||||||
$(SWIG) -ocaml -co swig.ml
|
|
||||||
$(OCC) -c swig.mli
|
|
||||||
$(OCC) -c swig.ml
|
|
||||||
$(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACE)
|
$(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACE)
|
||||||
cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c)
|
cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c)
|
||||||
$(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \
|
$(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \
|
||||||
|
|
@ -611,7 +609,7 @@ ocaml_static_cpp: $(SRCS)
|
||||||
$(OCC) -g -c $(INTERFACE:%.i=%.mli)
|
$(OCC) -g -c $(INTERFACE:%.i=%.mli)
|
||||||
$(OCC) -g -c $(INTERFACE:%.i=%.ml)
|
$(OCC) -g -c $(INTERFACE:%.i=%.ml)
|
||||||
test -z "$(PROGFILE)" || test -f "$(PROGFILE)" && \
|
test -z "$(PROGFILE)" || test -f "$(PROGFILE)" && \
|
||||||
$(OCC) -c $(PROGFILE)
|
$(OCC) $(OCAMLPP) -c $(PROGFILE)
|
||||||
$(NOLINK) || $(OCC) -g -ccopt -g -cclib -g -custom -o $(TARGET) \
|
$(NOLINK) || $(OCC) -g -ccopt -g -cclib -g -custom -o $(TARGET) \
|
||||||
swig.cmo \
|
swig.cmo \
|
||||||
$(INTERFACE:%.i=%.cmo) \
|
$(INTERFACE:%.i=%.cmo) \
|
||||||
|
|
@ -620,10 +618,7 @@ ocaml_static_cpp: $(SRCS)
|
||||||
-cclib "$(LIBS)" -cc '$(CXX)'
|
-cclib "$(LIBS)" -cc '$(CXX)'
|
||||||
|
|
||||||
ocaml_static_cpp_toplevel: $(SRCS)
|
ocaml_static_cpp_toplevel: $(SRCS)
|
||||||
$(SWIG) -ocaml -co swig.mli
|
$(OCAMLCORE)
|
||||||
$(SWIG) -ocaml -co swig.ml
|
|
||||||
$(OCC) -c swig.mli
|
|
||||||
$(OCC) -c swig.ml
|
|
||||||
$(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACE)
|
$(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACE)
|
||||||
cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c)
|
cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c)
|
||||||
$(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \
|
$(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \
|
||||||
|
|
@ -631,19 +626,17 @@ ocaml_static_cpp_toplevel: $(SRCS)
|
||||||
$(OCC) -g -c $(INTERFACE:%.i=%.mli)
|
$(OCC) -g -c $(INTERFACE:%.i=%.mli)
|
||||||
$(OCC) -g -c $(INTERFACE:%.i=%.ml)
|
$(OCC) -g -c $(INTERFACE:%.i=%.ml)
|
||||||
test -z "$(PROGFILE)" || test -f "$(PROGFILE)" && \
|
test -z "$(PROGFILE)" || test -f "$(PROGFILE)" && \
|
||||||
$(OCC) -c $(PROGFILE)
|
$(OCC) $(OCAMLPP) -c $(PROGFILE)
|
||||||
$(NOLINK) || $(OCAMLMKTOP) \
|
$(NOLINK) || $(OCAMLMKTOP) \
|
||||||
swig.cmo \
|
swig.cmo \
|
||||||
|
-I `camlp4 -where` camlp4o.cma swigp4.cmo \
|
||||||
-g -ccopt -g -cclib -g -custom -o $(TARGET)_top \
|
-g -ccopt -g -cclib -g -custom -o $(TARGET)_top \
|
||||||
$(INTERFACE:%.i=%.cmo) \
|
$(INTERFACE:%.i=%.cmo) \
|
||||||
$(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) \
|
$(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) \
|
||||||
-cclib "$(LIBS)" -cc '$(CXX)'
|
-cclib "$(LIBS)" -cc '$(CXX)'
|
||||||
|
|
||||||
ocaml_dynamic_cpp: $(SRCS)
|
ocaml_dynamic_cpp: $(SRCS)
|
||||||
$(SWIG) -ocaml -co swig.mli
|
$(OCAMLCORE)
|
||||||
$(SWIG) -ocaml -co swig.ml
|
|
||||||
$(OCC) -c swig.mli
|
|
||||||
$(OCC) -c swig.ml
|
|
||||||
$(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACE)
|
$(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACE)
|
||||||
cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c)
|
cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c)
|
||||||
$(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \
|
$(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \
|
||||||
|
|
@ -657,7 +650,7 @@ ocaml_dynamic_cpp: $(SRCS)
|
||||||
rm $(INTERFACE:%.i=%.mli)
|
rm $(INTERFACE:%.i=%.mli)
|
||||||
$(OCAMLFIND) $(OCC) -g -c -package dl $(INTERFACE:%.i=%.ml)
|
$(OCAMLFIND) $(OCC) -g -c -package dl $(INTERFACE:%.i=%.ml)
|
||||||
test -z "$(PROGFILE)" || test -f "$(PROGFILE)" && \
|
test -z "$(PROGFILE)" || test -f "$(PROGFILE)" && \
|
||||||
$(OCC) -c $(PROGFILE)
|
$(OCC) $(OCAMLPP) -c $(PROGFILE)
|
||||||
$(NOLINK) || $(OCAMLFIND) \
|
$(NOLINK) || $(OCAMLFIND) \
|
||||||
swig.cmo \
|
swig.cmo \
|
||||||
$(OCC) -cclib -export-dynamic -g -ccopt -g -cclib -g -custom \
|
$(OCC) -cclib -export-dynamic -g -ccopt -g -cclib -g -custom \
|
||||||
|
|
@ -666,10 +659,7 @@ ocaml_dynamic_cpp: $(SRCS)
|
||||||
$(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo) -cc '$(CXX)'
|
$(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo) -cc '$(CXX)'
|
||||||
|
|
||||||
ocaml_static_multi_cpp: $(SRCS)
|
ocaml_static_multi_cpp: $(SRCS)
|
||||||
$(SWIG) -ocaml -co swig.mli
|
$(OCAMLCORE)
|
||||||
$(SWIG) -ocaml -co swig.ml
|
|
||||||
$(OCC) -c swig.mli
|
|
||||||
$(OCC) -c swig.ml
|
|
||||||
$(SWIG) -c -ocaml -c++ $(SWIGOPT) \
|
$(SWIG) -c -ocaml -c++ $(SWIGOPT) \
|
||||||
$(INTERFACE)
|
$(INTERFACE)
|
||||||
cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c)
|
cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c)
|
||||||
|
|
@ -678,7 +668,7 @@ ocaml_static_multi_cpp: $(SRCS)
|
||||||
$(OCC) -g -c $(INTERFACE:%.i=%.mli)
|
$(OCC) -g -c $(INTERFACE:%.i=%.mli)
|
||||||
$(OCC) -g -c $(INTERFACE:%.i=%.ml)
|
$(OCC) -g -c $(INTERFACE:%.i=%.ml)
|
||||||
test -z "$(PROGFILE)" || test -f "$(PROGFILE)" && \
|
test -z "$(PROGFILE)" || test -f "$(PROGFILE)" && \
|
||||||
$(OCC) -c $(PROGFILE)
|
$(OCC) $(OCAMLPP) -c $(PROGFILE)
|
||||||
$(NOLINK) || $(OCC) -g -ccopt -g -cclib -g -custom -o $(TARGET) \
|
$(NOLINK) || $(OCC) -g -ccopt -g -cclib -g -custom -o $(TARGET) \
|
||||||
swig.cmo \
|
swig.cmo \
|
||||||
$(INTERFACE:%.i=%.cmo) \
|
$(INTERFACE:%.i=%.cmo) \
|
||||||
|
|
@ -686,7 +676,7 @@ ocaml_static_multi_cpp: $(SRCS)
|
||||||
$(INTERFACE:%.i=%_wrap.@OBJEXT@) -cclib "$(LIBS)" -cc '$(CXX)'
|
$(INTERFACE:%.i=%_wrap.@OBJEXT@) -cclib "$(LIBS)" -cc '$(CXX)'
|
||||||
|
|
||||||
ocaml_clean:
|
ocaml_clean:
|
||||||
rm -f *.@OBJEXT@ *@SO@ *_wrap* *~ .~* core @EXTRA_CLEAN@ *.cmo *.cmi $(MLFILE) $(MLFILE)i
|
rm -f *.@OBJEXT@ *@SO@ *_wrap* *~ .~* core @EXTRA_CLEAN@ *.cmo *.cmi $(MLFILE) $(MLFILE)i swig.mli swig.cmi swig.ml swig.cmo swigp4.ml swigp4.cmo
|
||||||
|
|
||||||
##################################################################
|
##################################################################
|
||||||
##### RUBY ######
|
##### RUBY ######
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue