jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed example makefiles and put extra -gs in the Examples Makefile.in

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@4384 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Art Yerkes 2003-02-25 01:19:25 +00:00
commit b117a28c99
4 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Examples/Makefile.in
View file

@ -512,12 +512,12 @@ NOLINK ?= false
ocaml_static: $(SRCS) ocaml_static: $(SRCS)
$(SWIG) -ocaml $(SWIGOPT) $(INTERFACE) $(SWIG) -ocaml $(SWIGOPT) $(INTERFACE)
$(OCC) -g -c -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) -c $(PROGFILE)
$(NOLINK) || $(OCC) -g -custom -o $(TARGET) \ $(NOLINK) || $(OCC) -g -ccopt -g -cclib -g -custom -o $(TARGET) \
$(INTERFACE:%.i=%.cmo) \ $(INTERFACE:%.i=%.cmo) \
$(PROGFILE:%.ml=%.cmo) \ $(PROGFILE:%.ml=%.cmo) \
$(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)" $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)"
@ -526,13 +526,13 @@ ocaml_static_cpp: $(SRCS)
$(SWIG) -ocaml -c++ $(SWIGOPT) \ $(SWIG) -ocaml -c++ $(SWIGOPT) \
$(INTERFACE) $(INTERFACE)
cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c) cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c)
$(OCC) -cc '$(CXX)' -g -c -ccopt "-xc++ $(INCLUDES)" \ $(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \
$(ICXXSRCS:%.cxx=%.c) $(SRCS) $(CXXSRCS) $(ICXXSRCS:%.cxx=%.c) $(SRCS) $(CXXSRCS)
$(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) -c $(PROGFILE)
$(NOLINK) || $(OCC) -g -custom -o $(TARGET) \ $(NOLINK) || $(OCC) -g -ccopt -g -cclib -g -custom -o $(TARGET) \
$(INTERFACE:%.i=%.cmo) \ $(INTERFACE:%.i=%.cmo) \
$(PROGFILE:%.ml=%.cmo) \ $(PROGFILE:%.ml=%.cmo) \
$(INTERFACE:%.i=%_wrap.@OBJEXT@) -cclib "$(LIBS)" -cc '$(CXX)' $(INTERFACE:%.i=%_wrap.@OBJEXT@) -cclib "$(LIBS)" -cc '$(CXX)'
@ -541,13 +541,13 @@ ocaml_static_multi_cpp: $(SRCS)
$(SWIG) -c -ocaml -c++ $(SWIGOPT) \ $(SWIG) -c -ocaml -c++ $(SWIGOPT) \
$(INTERFACE) $(INTERFACE)
cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c) cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c)
$(OCC) -cc '$(CXX)' -g -c -ccopt "-xc++ $(INCLUDES)" \ $(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \
$(ICXXSRCS:%.cxx=%.c) $(SRCS) $(CXXSRCS) $(ICXXSRCS:%.cxx=%.c) $(SRCS) $(CXXSRCS)
$(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) -c $(PROGFILE)
$(NOLINK) || $(OCC) -g -custom -o $(TARGET) \ $(NOLINK) || $(OCC) -g -ccopt -g -cclib -g -custom -o $(TARGET) \
$(INTERFACE:%.i=%.cmo) \ $(INTERFACE:%.i=%.cmo) \
$(PROGFILE:%.ml=%.cmo) \ $(PROGFILE:%.ml=%.cmo) \
$(INTERFACE:%.i=%_wrap.@OBJEXT@) -cclib "$(LIBS)" -cc '$(CXX)' $(INTERFACE:%.i=%_wrap.@OBJEXT@) -cclib "$(LIBS)" -cc '$(CXX)'

3
Examples/ocaml/check.list
View file

@ -1,2 +1,5 @@
# see top-level Makefile.in # see top-level Makefile.in
simple simple
std_string
std_vector
stl

6
Examples/ocaml/std_string/Makefile
View file

@ -5,11 +5,7 @@ TARGET = example
INTERFACE = example.i INTERFACE = example.i
PROGFILE = runme.ml PROGFILE = runme.ml
default:: static all default:: static
all::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ocaml_cpp
static:: static::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \

6
Examples/ocaml/std_vector/Makefile
View file

@ -5,11 +5,7 @@ TARGET = example
INTERFACE = example.i INTERFACE = example.i
PROGFILE = runme.ml PROGFILE = runme.ml
default:: static all default:: static
all::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ocaml_cpp
static:: static::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \