diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2015-08-20 06:16:01 +0100 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2015-08-21 22:43:17 +0100 |
| commit | 8e2bc595c67b57a2bd58661b08dc2d7585090e37 (patch) | |
| tree | 49af8e4d6940f49d03de2c5450852cd4a219f384 /Examples/java/extend | |
| parent | 4ef3507e8bcfde26ef0de11fa82b03068dbd01b2 (diff) | |
| download | swig-8e2bc595c67b57a2bd58661b08dc2d7585090e37.tar.gz | |
Remove use of preinst-swig script
Complete the prototype removal in ca1431.
The script prevents SWIGTOOL=gdb from working as gdb can't be used to
debug a shell script, it requires a binary.
Add support for SWIGTOOL in all the examples.
SWIG_LIB_DIR and SWIGEXE must now instead be set by all Makefiles.
See issue #473.
Diffstat (limited to 'Examples/java/extend')
| -rw-r--r-- | Examples/java/extend/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Examples/java/extend/Makefile b/Examples/java/extend/Makefile index 13cfd1708..c76e09262 100644 --- a/Examples/java/extend/Makefile +++ b/Examples/java/extend/Makefile @@ -1,5 +1,6 @@ TOP = ../.. -SWIG = $(TOP)/../preinst-swig +SWIGEXE = $(TOP)/../swig +SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib CXXSRCS = example.cxx TARGET = example INTERFACE = example.i @@ -10,7 +11,8 @@ check: build $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_run build: - $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ + $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' \ + SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile |