[Swig-cvs] SF.net SVN: swig:[13195] branches/gsoc2012-c/Examples

[<le...@us...>]

Revision: 13195
          http://swig.svn.sourceforge.net/swig/?rev=13195&view=rev
Author:   leiflm
Date:     2012-06-26 16:37:50 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
Compile _proxy.c even if _runme.c does not exist.

Modified Paths:
--------------
    branches/gsoc2012-c/Examples/Makefile.in
    branches/gsoc2012-c/Examples/test-suite/c/Makefile.in

Modified: branches/gsoc2012-c/Examples/Makefile.in
===================================================================
--- branches/gsoc2012-c/Examples/Makefile.in	2012-06-26 16:37:34 UTC (rev 13194)
+++ branches/gsoc2012-c/Examples/Makefile.in	2012-06-26 16:37:50 UTC (rev 13195)
@@ -53,9 +53,10 @@
 XINCLUDE   = @XINCLUDES@
 
 IWRAP      = $(INTERFACE:.i=_wrap.i)
+IPROXYSRCS = $(INTERFACE:.i=_proxy.c)
 ISRCS      = $(IWRAP:.i=.c)
 ICXXSRCS   = $(IWRAP:.i=.cxx)
-IOBJS      = $(IWRAP:.i=.@OBJEXT@)
+IOBJS      = $(IWRAP:.i=.o) $(IPROXYSRCS:.c:.o)
 
 ##################################################################
 # Dynamic loading for C++
@@ -1180,11 +1181,13 @@
 c: $(SRCS)
 	$(SWIG) -c $(SWIGOPT) $(INTERFACEPATH)
 	$(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES)
+	$(CC) -c $(CCSHARED) $(CFLAGS) $(IPROXYSRCS) $(INCLUDES)
 	$(C_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO)
 	
 c_cpp: $(SRCS)
 	$(SWIG) -c++ -c $(SWIGOPT) $(INTERFACEPATH)
 	$(CXX) -c $(CCSHARED) $(CXXFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES)
+	$(CC) -c $(CCSHARED) $(CFLAGS) $(IPROXYSRCS) $(INCLUDES)
 	$(CXX_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(CLIBPREFIX)$(TARGET)$(C_SO)
 
 c_compile: $(RUNME) $(PROXY)

Modified: branches/gsoc2012-c/Examples/test-suite/c/Makefile.in
===================================================================
--- branches/gsoc2012-c/Examples/test-suite/c/Makefile.in	2012-06-26 16:37:34 UTC (rev 13194)
+++ branches/gsoc2012-c/Examples/test-suite/c/Makefile.in	2012-06-26 16:37:50 UTC (rev 13195)
@@ -65,7 +65,7 @@
 # a file is found which has _runme.c appended after the testcase name.
 run_testcase = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (\
-		cd $* && $(COMPILETOOL) $(CC) ../$*_runme.c $*_proxy.c -L. -l$* -o $*_runme && \
+		cd $* && $(COMPILETOOL) $(CC) ../$*_runme.c -L. -l$* -o $*_runme && \
 	  env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" DYLD_LIBRARY_PATH="$*:$$DYLD_LIBRARY_PATH" $(RUNTOOL) ./$*_runme;) \
 	fi;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.