Revert rev 11187 "Merged with recent changes from trunk."

This reverts commit c595e4d90ebfd63eb55430c735bb121cf690bd59.

Conflicts:

	Source/Modules/c.cxx

From: William S Fulton <wsf@fultondesigns.co.uk>

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@13033 626c5289-ae23-0410-ae9c-e8d60b6d4f22

Examples/GIFPlot/Java/shadow/Makefile

@@ -1,9 +1,8 @@
 TOP        = ../../..
 SWIG       = $(TOP)/../swig
-SWIGOPT    = -outcurrentdir
+SWIGOPT    = -I../../Interface
 SRCS       =
 TARGET     = gifplot
-INTERFACEDIR = ../../Interface/
 INTERFACE  = gifplot.i
 LIBS       = -L../.. -lgifplot
 INCLUDES   = -I../../Include
@@ -11,7 +10,7 @@ INCLUDES   = -I../../Include
 all::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \
-	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' java
+	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java
 	javac *.java
 
 clean::

Examples/GIFPlot/Java/shadow/README

@@ -1,5 +1,5 @@
 This example uses the file in ../../Interface/gifplot.i to build
-an interface with shadow classes.  After doing a make, run the program runme, ie: 'java runme'.
+an interface with shadow classes.  After doing a make, run the program main, ie: 'java main'.
 
-Note the differences in the runme.java files between this example and the  
+Note the differences in the main.java files between this example and the  
 'full' example. This example uses the shadow classes.

Examples/GIFPlot/Java/shadow/main.java

@@ -2,7 +2,7 @@
 
 import java.lang.Math;
 
-public class runme {
+public class main {
 
   static {
     try {