Merge branch 'kwwette-out-of-src'

* kwwette-out-of-src:
  Configured languages display improvement
  Fix out of source clean-android-examples
  Neaten up test-suite Makefile regeneration
  Remove duplicate test target in CCache Makefile
  Add in CPPFLAGS and LDFLAGS to examples/test-suite
  Remove unnecessary make invocation when running test-suite
  gitignore to ignore build directory names
  Partially fix R out of source test-suite
  Update all languages to use SCRIPTDIR
  Slight simplification of test-suite build for new out-of-source changes
  Allow examples and test-suite to be built out of source tree
  Add "make maintainer-clean" to Travis CI build
  CCache/Makefile.in: fix to allow out of source tree check/install
  Regenerate configured Makefile if Makefile.in or config.status have changed
  Fix segmentation fault in some Javascript examples
  configure.ac: print configured languages at end of configuration

Examples/android/class/Makefile

@@ -3,7 +3,7 @@ SWIG       = $(TOP)/../preinst-swig
 TARGET     = example
 INTERFACE  = example.i
 INTERFACEDIR = jni/
-PACKAGEDIR = src/org/swig
+PACKAGEDIR = $(SRCDIR)src/org/swig
 PACKAGENAME= org.swig.classexample
 SWIGOPT    = -package $(PACKAGENAME) -outdir $(PACKAGEDIR)/classexample
 PROJECTNAME= SwigClass
@@ -13,14 +13,14 @@ TARGETID  = 1
 check: build
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' \
 	PROJECTNAME='$(PROJECTNAME)' TARGETID='$(TARGETID)' android_cpp
 
 install:
-	$(MAKE) -f $(TOP)/Makefile INSTALLOPTIONS='$(INSTALLOPTIONS)' PROJECTNAME='$(PROJECTNAME)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' INSTALLOPTIONS='$(INSTALLOPTIONS)' PROJECTNAME='$(PROJECTNAME)' \
 	PACKAGEDIR='$(PACKAGEDIR)' PACKAGENAME='$(PACKAGENAME)' android_install
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' PROJECTNAME='$(PROJECTNAME)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='$(TARGET)' PROJECTNAME='$(PROJECTNAME)' \
 	PACKAGEDIR='$(PACKAGEDIR)' INTERFACEDIR='$(INTERFACEDIR)' android_clean

Examples/android/extend/Makefile

@@ -3,7 +3,7 @@ SWIG       = $(TOP)/../preinst-swig
 TARGET     = example
 INTERFACE  = example.i
 INTERFACEDIR = jni/
-PACKAGEDIR = src/org/swig
+PACKAGEDIR = $(SRCDIR)src/org/swig
 PACKAGENAME= org.swig.extendexample
 SWIGOPT    = -package $(PACKAGENAME) -outdir $(PACKAGEDIR)/extendexample
 PROJECTNAME= SwigExtend
@@ -13,14 +13,14 @@ TARGETID  = 1
 check: build
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' \
 	PROJECTNAME='$(PROJECTNAME)' TARGETID='$(TARGETID)' android_cpp
 
 install:
-	$(MAKE) -f $(TOP)/Makefile INSTALLOPTIONS='$(INSTALLOPTIONS)' PROJECTNAME='$(PROJECTNAME)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' INSTALLOPTIONS='$(INSTALLOPTIONS)' PROJECTNAME='$(PROJECTNAME)' \
 	PACKAGEDIR='$(PACKAGEDIR)' PACKAGENAME='$(PACKAGENAME)' android_install
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' PROJECTNAME='$(PROJECTNAME)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='$(TARGET)' PROJECTNAME='$(PROJECTNAME)' \
 	PACKAGEDIR='$(PACKAGEDIR)' INTERFACEDIR='$(INTERFACEDIR)' android_clean

Examples/android/simple/Makefile

@@ -3,7 +3,7 @@ SWIG       = $(TOP)/../preinst-swig
 TARGET     = example
 INTERFACE  = example.i
 INTERFACEDIR = jni/
-PACKAGEDIR = src/org/swig
+PACKAGEDIR = $(SRCDIR)src/org/swig
 PACKAGENAME= org.swig.simple
 SWIGOPT    = -package $(PACKAGENAME) -outdir $(PACKAGEDIR)/simple
 PROJECTNAME= SwigSimple
@@ -13,14 +13,14 @@ TARGETID  = 1
 check: build
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' \
 	PROJECTNAME='$(PROJECTNAME)' TARGETID='$(TARGETID)' android
 
 install:
-	$(MAKE) -f $(TOP)/Makefile INSTALLOPTIONS='$(INSTALLOPTIONS)' PROJECTNAME='$(PROJECTNAME)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' INSTALLOPTIONS='$(INSTALLOPTIONS)' PROJECTNAME='$(PROJECTNAME)' \
 	PACKAGEDIR='$(PACKAGEDIR)' PACKAGENAME='$(PACKAGENAME)' android_install
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' PROJECTNAME='$(PROJECTNAME)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='$(TARGET)' PROJECTNAME='$(PROJECTNAME)' \
 	PACKAGEDIR='$(PACKAGEDIR)' INTERFACEDIR='$(INTERFACEDIR)' android_clean

Examples/chicken/class/Makefile

@@ -6,7 +6,6 @@ CXXSRCS     = example.cxx
 TARGET      = class
 INCLUDE     =
 SWIGOPT     =
-CFLAGS      =
 VARIANT     =
 
 # uncomment the following lines to build a static exe (only pick one of the CHICKEN_MAIN lines)
@@ -15,24 +14,24 @@ VARIANT     =
 #VARIANT      = _static
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile CHICKEN_SCRIPT='runme-lowlevel.scm' chicken_run
-	$(MAKE) -f $(TOP)/Makefile CHICKEN_SCRIPT='runme-tinyclos.scm' chicken_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CHICKEN_SCRIPT='runme-lowlevel.scm' chicken_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CHICKEN_SCRIPT='runme-tinyclos.scm' chicken_run
 
 build: $(TARGET) $(TARGET)_proxy
 
 $(TARGET): $(INTERFACE) $(SRCS)
-	$(MAKE) -f $(TOP)/Makefile \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
 	SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \
 	INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \
 	SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)_cpp
 
 $(TARGET)_proxy: $(INTERFACE) $(SRCS)
-	$(MAKE) -f $(TOP)/Makefile \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
 	SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \
 	INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT) -proxy' TARGET='$(TARGET)_proxy' \
 	SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)_cpp
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile chicken_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' chicken_clean
 	rm -f example.scm
 	rm -f $(TARGET)

Examples/chicken/constants/Makefile

@@ -6,7 +6,6 @@ CXXSRCS     =
 TARGET      = constants
 INCLUDE     =
 SWIGOPT     =
-CFLAGS      =
 VARIANT     =
 
 # uncomment the following two lines to build a static exe
@@ -14,17 +13,17 @@ VARIANT     =
 #VARIANT      = _static
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile chicken_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' chicken_run
 
 build: $(TARGET)
 
 $(TARGET): $(INTERFACE) $(SRCS)
-	$(MAKE) -f $(TOP)/Makefile \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
 	SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \
 	INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \
 	SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile chicken_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' chicken_clean
 	rm -f example.scm
 	rm -f $(TARGET)

Examples/chicken/multimap/Makefile

@@ -6,7 +6,6 @@ CXXSRCS     =
 TARGET      = multimap
 INCLUDE     =
 SWIGOPT     =
-CFLAGS      =
 VARIANT     =
 
 # uncomment the following two lines to build a static exe
@@ -14,17 +13,17 @@ VARIANT     =
 #VARIANT      = _static
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile chicken_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' chicken_run
 
 build: $(TARGET)
 
 $(TARGET): $(INTERFACE) $(SRCS)
-	$(MAKE) -f $(TOP)/Makefile \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
 	SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \
 	INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \
 	SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile chicken_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' chicken_clean
 	rm -f example.scm
 	rm -f $(TARGET)

Examples/chicken/overload/Makefile

@@ -6,7 +6,6 @@ CXXSRCS     = example.cxx
 TARGET      = overload
 INCLUDE     =
 SWIGOPT     = -proxy -unhideprimitive
-CFLAGS      =
 VARIANT     =
 
 # uncomment the following lines to build a static exe
@@ -14,17 +13,17 @@ VARIANT     =
 #VARIANT      = _static
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile chicken_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' chicken_run
 
 build: $(TARGET)
 
 $(TARGET): $(INTERFACE) $(SRCS)
-	$(MAKE) -f $(TOP)/Makefile \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
 	SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \
 	INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \
 	SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)_cpp
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile chicken_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' chicken_clean
 	rm -f example.scm
 	rm -f $(TARGET)

Examples/chicken/simple/Makefile

@@ -6,7 +6,6 @@ CXXSRCS     =
 TARGET      = simple
 INCLUDE     =
 SWIGOPT     =
-CFLAGS      =
 VARIANT     =
 
 # uncomment the following two lines to build a static exe
@@ -14,17 +13,17 @@ VARIANT     =
 #VARIANT      = _static
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile chicken_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' chicken_run
 
 build: $(TARGET)
 
 $(TARGET): $(INTERFACE) $(SRCS)
-	$(MAKE) -f $(TOP)/Makefile \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \
 	SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \
 	INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \
 	SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile chicken_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' chicken_clean
 	rm -f example.scm example-generic.scm example-clos.scm
 	rm -f $(TARGET)

Examples/csharp/arrays/Makefile

@@ -8,12 +8,12 @@ CSHARPSRCS = *.cs
 CSHARPFLAGS= -nologo -debug+ -unsafe -out:runme.exe
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile csharp_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' csharp_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' csharp
-	$(MAKE) -f $(TOP)/Makefile CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile csharp_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' csharp_clean

Examples/csharp/callback/Makefile

@@ -8,12 +8,12 @@ CSHARPSRCS = *.cs
 CSHARPFLAGS= -nologo -debug+ -out:runme.exe
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile csharp_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' csharp_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' csharp_cpp
-	$(MAKE) -f $(TOP)/Makefile CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile csharp_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' csharp_clean

Examples/csharp/class/Makefile

@@ -8,12 +8,12 @@ CSHARPSRCS = *.cs
 CSHARPFLAGS= -nologo -debug+ -out:runme.exe
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile csharp_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' csharp_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' csharp_cpp
-	$(MAKE) -f $(TOP)/Makefile CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile csharp_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' csharp_clean

Examples/csharp/enum/Makefile

@@ -8,12 +8,12 @@ CSHARPSRCS = *.cs
 CSHARPFLAGS= -nologo -debug+ -out:runme.exe
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile csharp_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' csharp_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' csharp_cpp
-	$(MAKE) -f $(TOP)/Makefile CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile csharp_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' csharp_clean

Examples/csharp/extend/Makefile

@@ -8,12 +8,12 @@ CSHARPSRCS = *.cs
 CSHARPFLAGS= -nologo -debug+ -out:runme.exe
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile csharp_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' csharp_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' csharp_cpp
-	$(MAKE) -f $(TOP)/Makefile CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile csharp_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' csharp_clean

Examples/csharp/funcptr/Makefile

@@ -8,12 +8,12 @@ CSHARPSRCS = *.cs
 CSHARPFLAGS= -nologo -debug+ -out:runme.exe
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile csharp_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' csharp_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' csharp
-	$(MAKE) -f $(TOP)/Makefile CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile csharp_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' csharp_clean

Examples/csharp/nested/Makefile

@@ -8,12 +8,12 @@ CSHARPSRCS = *.cs
 CSHARPFLAGS= -nologo -debug+ -out:runme.exe
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile csharp_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' csharp_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' csharp_cpp
-	$(MAKE) -f $(TOP)/Makefile CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile csharp_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' csharp_clean

Examples/csharp/reference/Makefile

@@ -8,12 +8,12 @@ CSHARPSRCS = *.cs
 CSHARPFLAGS= -nologo -debug+ -out:runme.exe
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile csharp_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' csharp_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' csharp_cpp
-	$(MAKE) -f $(TOP)/Makefile CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile csharp_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' csharp_clean

Examples/csharp/simple/Makefile

@@ -8,12 +8,12 @@ CSHARPSRCS = *.cs
 CSHARPFLAGS= -nologo -debug+ -out:runme.exe
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile csharp_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' csharp_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' csharp
-	$(MAKE) -f $(TOP)/Makefile CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile csharp_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' csharp_clean

Examples/csharp/template/Makefile

@@ -8,12 +8,12 @@ CSHARPSRCS = *.cs
 CSHARPFLAGS= -nologo -debug+ -out:runme.exe
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile csharp_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' csharp_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' csharp_cpp
-	$(MAKE) -f $(TOP)/Makefile CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile csharp_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' csharp_clean

Examples/csharp/variables/Makefile

@@ -8,12 +8,12 @@ CSHARPSRCS = *.cs
 CSHARPFLAGS= -nologo -debug+ -out:runme.exe
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile csharp_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' csharp_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' csharp
-	$(MAKE) -f $(TOP)/Makefile CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile csharp_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' csharp_clean

Examples/d/callback/Makefile

@@ -15,13 +15,13 @@ DFLAGS        = -ofrunme
 
 check: build
 	cd $(WORKING_DIR); \
-	$(MAKE) -f $(TOP)/Makefile d_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' d_run
 
 build:
 	cd $(WORKING_DIR); \
-	$(MAKE) -f $(TOP)/Makefile EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d_cpp; \
-	$(MAKE) -f $(TOP)/Makefile DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d_cpp; \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile
 
 clean:
 	cd $(WORKING_DIR); \
-	$(MAKE) -f $(TOP)/Makefile d_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' d_clean

Examples/d/class/Makefile

@@ -15,13 +15,13 @@ DFLAGS        = -ofrunme
 
 check: build
 	cd $(WORKING_DIR); \
-	$(MAKE) -f $(TOP)/Makefile d_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' d_run
 
 build:
 	cd $(WORKING_DIR); \
-	$(MAKE) -f $(TOP)/Makefile EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d_cpp; \
-	$(MAKE) -f $(TOP)/Makefile DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d_cpp; \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile
 
 clean:
 	cd $(WORKING_DIR); \
-	$(MAKE) -f $(TOP)/Makefile d_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' d_clean

Examples/d/constants/Makefile

@@ -15,13 +15,13 @@ DFLAGS        = -ofrunme
 
 check: build
 	cd $(WORKING_DIR); \
-	$(MAKE) -f $(TOP)/Makefile d_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' d_run
 
 build:
 	cd $(WORKING_DIR); \
-	$(MAKE) -f $(TOP)/Makefile EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d; \
-	$(MAKE) -f $(TOP)/Makefile DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d; \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile
 
 clean:
 	cd $(WORKING_DIR); \
-	$(MAKE) -f $(TOP)/Makefile d_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' d_clean

Examples/d/enum/Makefile

@@ -15,13 +15,13 @@ DFLAGS        = -ofrunme
 
 check: build
 	cd $(WORKING_DIR); \
-	$(MAKE) -f $(TOP)/Makefile d_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' d_run
 
 build:
 	cd $(WORKING_DIR); \
-	$(MAKE) -f $(TOP)/Makefile EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d_cpp; \
-	$(MAKE) -f $(TOP)/Makefile DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d_cpp; \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile
 
 clean:
 	cd $(WORKING_DIR); \
-	$(MAKE) -f $(TOP)/Makefile d_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' d_clean

Examples/d/extend/Makefile

@@ -15,13 +15,13 @@ DFLAGS        = -ofrunme
 
 check: build
 	cd $(WORKING_DIR); \
-	$(MAKE) -f $(TOP)/Makefile d_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' d_run
 
 build:
 	cd $(WORKING_DIR); \
-	$(MAKE) -f $(TOP)/Makefile EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d_cpp; \
-	$(MAKE) -f $(TOP)/Makefile DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d_cpp; \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile
 
 clean:
 	cd $(WORKING_DIR); \
-	$(MAKE) -f $(TOP)/Makefile d_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' d_clean

Examples/d/funcptr/Makefile

@@ -15,13 +15,13 @@ DFLAGS        = -ofrunme
 
 check: build
 	cd $(WORKING_DIR); \
-	$(MAKE) -f $(TOP)/Makefile d_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' d_run
 
 build:
 	cd $(WORKING_DIR); \
-	$(MAKE) -f $(TOP)/Makefile EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d; \
-	$(MAKE) -f $(TOP)/Makefile DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d; \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile
 
 clean:
 	cd $(WORKING_DIR); \
-	$(MAKE) -f $(TOP)/Makefile d_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' d_clean

Examples/d/simple/Makefile

@@ -15,13 +15,13 @@ DFLAGS        = -ofrunme
 
 check: build
 	cd $(WORKING_DIR); \
-	$(MAKE) -f $(TOP)/Makefile d_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' d_run
 
 build:
 	cd $(WORKING_DIR); \
-	$(MAKE) -f $(TOP)/Makefile EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d; \
-	$(MAKE) -f $(TOP)/Makefile DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d; \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile
 
 clean:
 	cd $(WORKING_DIR); \
-	$(MAKE) -f $(TOP)/Makefile d_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' d_clean

Examples/d/variables/Makefile

@@ -15,13 +15,13 @@ DFLAGS        = -ofrunme
 
 check: build
 	cd $(WORKING_DIR); \
-	$(MAKE) -f $(TOP)/Makefile d_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' d_run
 
 build:
 	cd $(WORKING_DIR); \
-	$(MAKE) -f $(TOP)/Makefile EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d; \
-	$(MAKE) -f $(TOP)/Makefile DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d; \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile
 
 clean:
 	cd $(WORKING_DIR); \
-	$(MAKE) -f $(TOP)/Makefile d_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' d_clean

Examples/go/callback/Makefile

@@ -6,11 +6,11 @@ INTERFACE  = example.i
 SWIGOPT    =
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_cpp
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' go_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' INTERFACE='$(INTERFACE)' go_clean

Examples/go/class/Makefile

@@ -6,11 +6,11 @@ INTERFACE  = example.i
 LIBS       = -lm
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_cpp
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' go_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' INTERFACE='$(INTERFACE)' go_clean

Examples/go/constants/Makefile

@@ -6,11 +6,11 @@ INTERFACE  = example.i
 SWIGOPT    =
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' go_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' INTERFACE='$(INTERFACE)' go_clean

Examples/go/enum/Makefile

@@ -6,11 +6,11 @@ INTERFACE  = example.i
 SWIGOPT    =
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_cpp
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' go_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' INTERFACE='$(INTERFACE)' go_clean

Examples/go/extend/Makefile

@@ -6,11 +6,11 @@ INTERFACE  = example.i
 SWIGOPT    =
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_cpp
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' go_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' INTERFACE='$(INTERFACE)' go_clean

Examples/go/funcptr/Makefile

@@ -6,11 +6,11 @@ INTERFACE  = example.i
 SWIGOPT    =
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' go_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' INTERFACE='$(INTERFACE)' go_clean

Examples/go/multimap/Makefile

@@ -6,11 +6,11 @@ INTERFACE  = example.i
 SWIGOPT    =
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' go_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' INTERFACE='$(INTERFACE)' go_clean

Examples/go/pointer/Makefile

@@ -6,11 +6,11 @@ INTERFACE  = example.i
 SWIGOPT    =
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' go_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' INTERFACE='$(INTERFACE)' go_clean

Examples/go/reference/Makefile

@@ -6,11 +6,11 @@ INTERFACE  = example.i
 SWIGOPT    =
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_cpp
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' go_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' INTERFACE='$(INTERFACE)' go_clean

Examples/go/simple/Makefile

@@ -5,11 +5,11 @@ TARGET     = example
 INTERFACE  = example.i
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' go_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' INTERFACE='$(INTERFACE)' go_clean

Examples/go/template/Makefile

@@ -6,11 +6,11 @@ INTERFACE  = example.i
 SWIGOPT    =
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_cpp
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' go_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' INTERFACE='$(INTERFACE)' go_clean

Examples/go/variables/Makefile

@@ -6,11 +6,11 @@ INTERFACE  = example.i
 SWIGOPT    =
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' go_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' INTERFACE='$(INTERFACE)' go_clean

Examples/guile/class/Makefile

@@ -5,15 +5,15 @@ TARGET     = example
 INTERFACE  = example.i
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile guile_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' guile_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' guile_cpp
 
 static:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	TARGET='my-guile' INTERFACE='$(INTERFACE)' guile_static_cpp
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='$(TARGET)' guile_clean

Examples/guile/constants/Makefile

@@ -5,11 +5,11 @@ TARGET     = my-guile
 INTERFACE  = example.i
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_augmented_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='$(TARGET)' guile_augmented_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' guile_augmented
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='$(TARGET)' guile_clean

Examples/guile/matrix/Makefile

@@ -5,11 +5,11 @@ TARGET     = matrix
 INTERFACE  = example.i
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' GUILE_RUNOPTIONS='-e do-test' guile_augmented_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='$(TARGET)' GUILE_RUNOPTIONS='-e do-test' guile_augmented_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' LIBS='-lm' guile_augmented
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='$(TARGET)' guile_clean

Examples/guile/multimap/Makefile

@@ -5,15 +5,15 @@ TARGET     = example
 INTERFACE  = example.i
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile guile_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' guile_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' guile
 
 static:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='my-guile' INTERFACE='$(INTERFACE)' guile_static
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='$(TARGET)' guile_clean

Examples/guile/multivalue/Makefile

@@ -5,15 +5,15 @@ TARGET     = example
 INTERFACE  = example.i
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile guile_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' guile_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' guile
 
 static:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='my-guile' INTERFACE='$(INTERFACE)' guile_static
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='$(TARGET)' guile_clean

Examples/guile/port/Makefile

@@ -5,12 +5,12 @@ TARGET     = port
 INTERFACE  = example.i
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_augmented_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='$(TARGET)' guile_augmented_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' guile_augmented
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='$(TARGET)' guile_clean
 	rm -f test.out

Examples/guile/simple/Makefile

@@ -5,11 +5,11 @@ TARGET     = my-guile
 INTERFACE  = example.i
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_augmented_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='$(TARGET)' guile_augmented_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' guile_augmented
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='$(TARGET)' guile_clean

Examples/guile/std_vector/Makefile

@@ -5,15 +5,15 @@ TARGET     = example
 INTERFACE  = example.i
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile guile_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' guile_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' guile_cpp
 
 static:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	TARGET='my-guile' INTERFACE='$(INTERFACE)' guile_static_cpp
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='$(TARGET)' guile_clean

Examples/java/callback/Makefile

@@ -7,12 +7,12 @@ SWIGOPT    =
 JAVASRCS   = *.java
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile java_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp
-	$(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile java_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_clean

Examples/java/class/Makefile

@@ -7,12 +7,12 @@ SWIGOPT    =
 JAVASRCS   = *.java
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile java_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp
-	$(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile java_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_clean

Examples/java/constants/Makefile

@@ -7,12 +7,12 @@ SWIGOPT    =
 JAVASRCS   = *.java
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile java_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp
-	$(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile java_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_clean

Examples/java/enum/Makefile

@@ -7,12 +7,12 @@ SWIGOPT    =
 JAVASRCS   = *.java
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile java_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp
-	$(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile java_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_clean

Examples/java/extend/Makefile

@@ -7,12 +7,12 @@ SWIGOPT    =
 JAVASRCS   = *.java
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile java_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp
-	$(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile java_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_clean

Examples/java/funcptr/Makefile

@@ -7,12 +7,12 @@ SWIGOPT    =
 JAVASRCS   = *.java
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile java_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java
-	$(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile java_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_clean

Examples/java/multimap/Makefile

@@ -7,12 +7,12 @@ SWIGOPT    =
 JAVASRCS   = *.java
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile java_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java
-	$(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile java_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_clean

Examples/java/native/Makefile

@@ -7,12 +7,12 @@ SWIGOPT    =
 JAVASRCS   = *.java
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile java_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java
-	$(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile java_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_clean

Examples/java/nested/Makefile

@@ -7,12 +7,12 @@ SWIGOPT    =
 JAVASRCS   = *.java
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile java_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp
-	$(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile java_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_clean

Examples/java/pointer/Makefile

@@ -7,12 +7,12 @@ SWIGOPT    =
 JAVASRCS   = *.java
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile java_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java
-	$(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile java_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_clean

Examples/java/reference/Makefile

@@ -7,12 +7,12 @@ SWIGOPT    =
 JAVASRCS   = *.java
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile java_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp
-	$(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile java_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_clean

Examples/java/simple/Makefile

@@ -7,12 +7,12 @@ SWIGOPT    =
 JAVASRCS   = *.java
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile java_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java
-	$(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile java_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_clean

Examples/java/template/Makefile

@@ -7,12 +7,12 @@ SWIGOPT    =
 JAVASRCS   = *.java
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile java_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp
-	$(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile java_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_clean

Examples/java/typemap/Makefile

@@ -7,12 +7,12 @@ SWIGOPT    =
 JAVASRCS   = *.java
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile java_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java
-	$(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile java_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_clean

Examples/java/variables/Makefile

@@ -7,12 +7,12 @@ SWIGOPT    =
 JAVASRCS   = *.java
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile java_run
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_run
 
 build:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java
-	$(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile
 
 clean:
-	$(MAKE) -f $(TOP)/Makefile java_clean
+	$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' java_clean

Examples/javascript/class/Makefile

@@ -1,3 +1,3 @@
 SRCS = example.cxx
 
-include ../example.mk
+include $(SRCDIR)../example.mk

Examples/javascript/class/binding.gyp

@@ -1,8 +0,0 @@
-{
-  "targets": [
-    {
-      "target_name": "example",
-      "sources": [ "example.cxx", "example_wrap.cxx" ]
-    }
-  ]
-}

Examples/javascript/class/binding.gyp.in

@@ -0,0 +1,9 @@
+{
+  "targets": [
+    {
+      "target_name": "example",
+      "sources": [ "$srcdir/example.cxx", "example_wrap.cxx" ],
+      "include_dirs": ["$srcdir"]
+    }
+  ]
+}

Examples/javascript/class/example.js

@@ -1 +1 @@
-module.exports = require("./build/Release/example");
+module.exports = require("build/Release/example");

Examples/javascript/class/runme.js

@@ -1,4 +1,4 @@
-var example = require("./example");
+var example = require("example");
 
 // ----- Object creation -----
 

Examples/javascript/constant/Makefile

@@ -1,3 +1,3 @@
 SRCS =
 
-include ../example.mk
+include $(SRCDIR)../example.mk

Examples/javascript/constant/binding.gyp

@@ -1,8 +0,0 @@
-{
-  "targets": [
-    {
-      "target_name": "example",
-      "sources": [ "example_wrap.cxx" ]
-    }
-  ]
-}

Examples/javascript/constant/binding.gyp.in

@@ -0,0 +1,9 @@
+{
+  "targets": [
+    {
+      "target_name": "example",
+      "sources": [ "example_wrap.cxx" ],
+      "include_dirs": ["$srcdir"]
+    }
+  ]
+}

Examples/javascript/constant/example.js

@@ -1 +1 @@
-module.exports = require("./build/Release/example");
+module.exports = require("build/Release/example");

Examples/javascript/constant/runme.js

@@ -1,4 +1,4 @@
-var example = require("./example");
+var example = require("example");
 
 console.log("ICONST  = " + example.ICONST  + " (should be 42)");
 console.log("FCONST  = " + example.FCONST  + " (should be 2.1828)");

Examples/javascript/enum/Makefile

@@ -1,3 +1,3 @@
 SRCS = example.cxx
 
-include ../example.mk
+include $(SRCDIR)../example.mk

Examples/javascript/enum/binding.gyp

@@ -1,8 +0,0 @@
-{
-  "targets": [
-    {
-      "target_name": "example",
-      "sources": [ "example.cxx", "example_wrap.cxx" ]
-    }
-  ]
-}

Examples/javascript/enum/binding.gyp.in

@@ -0,0 +1,9 @@
+{
+  "targets": [
+    {
+      "target_name": "example",
+      "sources": [ "$srcdir/example.cxx", "example_wrap.cxx" ],
+      "include_dirs": ["$srcdir"]
+    }
+  ]
+}

Examples/javascript/enum/example.js

@@ -1 +1 @@
-module.exports = require("./build/Release/example");
+module.exports = require("build/Release/example");

Examples/javascript/enum/runme.js

@@ -1,4 +1,4 @@
-var example = require("./example");
+var example = require("example");
 
 // ----- Object creation -----
 

Examples/javascript/example.mk

@@ -15,13 +15,13 @@ INTERFACE = example.i
 SWIGOPT=-$(JSENGINE)
 
 check: build
-	$(MAKE) -f $(EXAMPLES_TOP)/Makefile JSENGINE='$(JSENGINE)' TARGET='$(TARGET)' javascript_run
+	$(MAKE) -f $(EXAMPLES_TOP)/Makefile SRCDIR='$(SRCDIR)' JSENGINE='$(JSENGINE)' TARGET='$(TARGET)' javascript_run
 
 build:
-	$(MAKE) -f $(EXAMPLES_TOP)/Makefile CXXSRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(EXAMPLES_TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' javascript_wrapper_cpp
-	$(MAKE) -f $(EXAMPLES_TOP)/Makefile CXXSRCS='$(SRCS)' SWIG='$(SWIG)' \
+	$(MAKE) -f $(EXAMPLES_TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' JSENGINE='$(JSENGINE)' javascript_build_cpp
 
 clean:
-	$(MAKE) -f $(EXAMPLES_TOP)/Makefile javascript_clean
+	$(MAKE) -f $(EXAMPLES_TOP)/Makefile SRCDIR='$(SRCDIR)' javascript_clean

Examples/javascript/exception/Makefile

@@ -1,3 +1,3 @@
 SRCS = example.cxx
 
-include ../example.mk
+include $(SRCDIR)../example.mk

Examples/javascript/exception/binding.gyp.in

@@ -2,7 +2,8 @@
   "targets": [
     {
       "target_name": "example",
-      "sources": [ "example.cxx", "example_wrap.cxx" ],
+      "sources": [ "$srcdir/example.cxx", "example_wrap.cxx" ],
+      "include_dirs": ["$srcdir"],
       'defines': [
         'BUILDING_NODE_EXTENSION=1',
       ],

Examples/javascript/exception/example.js

@@ -1 +1 @@
-module.exports = require("./build/Release/example");
+module.exports = require("build/Release/example");

Examples/javascript/exception/runme.js

@@ -1,4 +1,4 @@
-var example = require("./example");
+var example = require("example");
 
 console.log("Trying to catch some exceptions.");
 t = new example.Test();

Examples/javascript/functor/Makefile

@@ -1,3 +1,3 @@
 SRCS = example.cxx
 
-include ../example.mk
+include $(SRCDIR)../example.mk

Examples/javascript/functor/binding.gyp

@@ -1,8 +0,0 @@
-{
-  "targets": [
-    {
-      "target_name": "example",
-      "sources": [ "example.cxx", "example_wrap.cxx" ]
-    }
-  ]
-}

Examples/javascript/functor/binding.gyp.in

@@ -0,0 +1,9 @@
+{
+  "targets": [
+    {
+      "target_name": "example",
+      "sources": [ "$srcdir/example.cxx", "example_wrap.cxx" ],
+      "include_dirs": ["$srcdir"]
+    }
+  ]
+}

Examples/javascript/functor/example.js

@@ -1 +1 @@
-module.exports = require("./build/Release/example");
+module.exports = require("build/Release/example");

Examples/javascript/functor/runme.js

@@ -1,4 +1,4 @@
-var example = require("./example");
+var example = require("example");
 
 a = new example.intSum(0);
 b = new example.doubleSum(100.0);

Examples/javascript/nspace/Makefile

@@ -1,3 +1,3 @@
 SRCS =
 
-include ../example.mk
+include $(SRCDIR)../example.mk

Examples/javascript/nspace/binding.gyp

@@ -1,8 +0,0 @@
-{
-  "targets": [
-    {
-      "target_name": "example",
-      "sources": [ "example_wrap.cxx" ]
-    }
-  ]
-}

Examples/javascript/nspace/binding.gyp.in

@@ -0,0 +1,9 @@
+{
+  "targets": [
+    {
+      "target_name": "example",
+      "sources": [ "example_wrap.cxx" ],
+      "include_dirs": ["$srcdir"]
+    }
+  ]
+}

Examples/javascript/nspace/example.js

@@ -1 +1 @@
-module.exports = require("./build/Release/example");
+module.exports = require("build/Release/example");

Examples/javascript/nspace/runme.js

@@ -3,7 +3,7 @@
 // This file illustrates class C++ interface generated
 // by SWIG.
 
-var example = require("./example");
+var example = require("example");
 
 // Calling a module function ( aka global function )
 if (example.module_function() !== 7) {

Examples/javascript/operator/Makefile

@@ -1,3 +1,3 @@
 SRCS =
 
-include ../example.mk
+include $(SRCDIR)../example.mk

Examples/javascript/operator/binding.gyp

@@ -1,8 +0,0 @@
-{
-  "targets": [
-    {
-      "target_name": "example",
-      "sources": [ "example_wrap.cxx" ]
-    }
-  ]
-}

Examples/javascript/operator/binding.gyp.in

@@ -0,0 +1,9 @@
+{
+  "targets": [
+    {
+      "target_name": "example",
+      "sources": [ "example_wrap.cxx" ],
+      "include_dirs": ["$srcdir"]
+    }
+  ]
+}

Examples/javascript/operator/example.js

@@ -1 +1 @@
-module.exports = require("./build/Release/example");
+module.exports = require("build/Release/example");

Examples/javascript/operator/runme.js

@@ -1,4 +1,4 @@
-var example = require("./example");
+var example = require("example");
 
 a = new example.Complex(2,3);
 b = new example.Complex(-5,10);

Examples/javascript/overload/Makefile

@@ -1,3 +1,3 @@
 SRCS =
 
-include ../example.mk
+include $(SRCDIR)../example.mk

Examples/javascript/overload/binding.gyp

@@ -1,8 +0,0 @@
-{
-  "targets": [
-    {
-      "target_name": "example",
-      "sources": [ "example_wrap.cxx" ]
-    }
-  ]
-}