From 8713199267acea20d0fa1fe5841afdb90e8427ab Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 12 Apr 2013 22:22:36 +0100 Subject: [PATCH] Move javac compile for examples into common Makefile for examples --- Examples/Makefile.in | 7 +++++++ Examples/java/callback/Makefile | 3 ++- Examples/java/class/Makefile | 3 ++- Examples/java/constants/Makefile | 3 ++- Examples/java/enum/Makefile | 3 ++- Examples/java/extend/Makefile | 3 ++- Examples/java/funcptr/Makefile | 3 ++- Examples/java/multimap/Makefile | 3 ++- Examples/java/native/Makefile | 3 ++- Examples/java/pointer/Makefile | 3 ++- Examples/java/reference/Makefile | 3 ++- Examples/java/simple/Makefile | 3 ++- Examples/java/template/Makefile | 3 ++- Examples/java/typemap/Makefile | 3 ++- Examples/java/variables/Makefile | 3 ++- 15 files changed, 35 insertions(+), 14 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 91aab1c83..24e1e6a5e 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -547,6 +547,13 @@ java_cpp: $(SRCS) $(CXX) -c $(CCSHARED) $(CFLAGS) $(JAVACFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(JAVA_INCLUDE) $(JAVACXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(JAVA_LIBPREFIX)$(TARGET)$(JAVASO) +# ---------------------------------------------------------------- +# Compile java files +# ---------------------------------------------------------------- + +java_compile: $(SRCS) + $(COMPILETOOL) $(JAVAC) $(JAVACFLAGS) $(JAVASRCS) + # ----------------------------------------------------------------- # Run java example # ----------------------------------------------------------------- diff --git a/Examples/java/callback/Makefile b/Examples/java/callback/Makefile index c4d4d0e36..8f274e7cb 100644 --- a/Examples/java/callback/Makefile +++ b/Examples/java/callback/Makefile @@ -4,6 +4,7 @@ CXXSRCS = example.cxx TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/class/Makefile b/Examples/java/class/Makefile index c4d4d0e36..8f274e7cb 100644 --- a/Examples/java/class/Makefile +++ b/Examples/java/class/Makefile @@ -4,6 +4,7 @@ CXXSRCS = example.cxx TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/constants/Makefile b/Examples/java/constants/Makefile index 0c7c16349..97c5b673c 100644 --- a/Examples/java/constants/Makefile +++ b/Examples/java/constants/Makefile @@ -4,6 +4,7 @@ CXXSRCS = TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/enum/Makefile b/Examples/java/enum/Makefile index c4d4d0e36..8f274e7cb 100644 --- a/Examples/java/enum/Makefile +++ b/Examples/java/enum/Makefile @@ -4,6 +4,7 @@ CXXSRCS = example.cxx TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/extend/Makefile b/Examples/java/extend/Makefile index c4d4d0e36..8f274e7cb 100644 --- a/Examples/java/extend/Makefile +++ b/Examples/java/extend/Makefile @@ -4,6 +4,7 @@ CXXSRCS = example.cxx TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/funcptr/Makefile b/Examples/java/funcptr/Makefile index ce51a1c74..e9e29f3a3 100644 --- a/Examples/java/funcptr/Makefile +++ b/Examples/java/funcptr/Makefile @@ -4,6 +4,7 @@ SRCS = example.c TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/multimap/Makefile b/Examples/java/multimap/Makefile index ce51a1c74..e9e29f3a3 100644 --- a/Examples/java/multimap/Makefile +++ b/Examples/java/multimap/Makefile @@ -4,6 +4,7 @@ SRCS = example.c TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/native/Makefile b/Examples/java/native/Makefile index 39e8f6d7f..29d5a082a 100644 --- a/Examples/java/native/Makefile +++ b/Examples/java/native/Makefile @@ -4,6 +4,7 @@ SRCS = TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/pointer/Makefile b/Examples/java/pointer/Makefile index ce51a1c74..e9e29f3a3 100644 --- a/Examples/java/pointer/Makefile +++ b/Examples/java/pointer/Makefile @@ -4,6 +4,7 @@ SRCS = example.c TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/reference/Makefile b/Examples/java/reference/Makefile index c4d4d0e36..8f274e7cb 100644 --- a/Examples/java/reference/Makefile +++ b/Examples/java/reference/Makefile @@ -4,6 +4,7 @@ CXXSRCS = example.cxx TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/simple/Makefile b/Examples/java/simple/Makefile index ce51a1c74..e9e29f3a3 100644 --- a/Examples/java/simple/Makefile +++ b/Examples/java/simple/Makefile @@ -4,6 +4,7 @@ SRCS = example.c TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/template/Makefile b/Examples/java/template/Makefile index 0c7c16349..97c5b673c 100644 --- a/Examples/java/template/Makefile +++ b/Examples/java/template/Makefile @@ -4,6 +4,7 @@ CXXSRCS = TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/typemap/Makefile b/Examples/java/typemap/Makefile index 39e8f6d7f..29d5a082a 100644 --- a/Examples/java/typemap/Makefile +++ b/Examples/java/typemap/Makefile @@ -4,6 +4,7 @@ SRCS = TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/variables/Makefile b/Examples/java/variables/Makefile index ce51a1c74..e9e29f3a3 100644 --- a/Examples/java/variables/Makefile +++ b/Examples/java/variables/Makefile @@ -4,6 +4,7 @@ SRCS = example.c TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean