From a8b523f46d8ddc52fbe6d3d216b1cd6fe42ae067 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Thu, 22 Nov 2007 23:59:37 +0000 Subject: [PATCH] Tweaks to R git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10165 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/Makefile.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index c0c524d35..ec3c64429 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1029,20 +1029,19 @@ uffi_clean: ################################################################## R = R -RSRCS = $(INTERFACE:.i=_wrap.c) #special code for R build system -RCXXSRCS = $(INTERFACE:.i=_wrap.cpp) #special code for R build system +RCXXSRCS = $(INTERFACE:.i=_wrap.cpp) #Need to use _wrap.cpp for R build system as it does not understand _wrap.cxx RRSRC = $(INTERFACE:.i=.R) r: $(SRCS) - $(SWIG) -r $(SWIGOPT) -o $(RSRCS) $(INTERFACE) - +( PKG_LIBS="$(SRCS)" PKG_CPPFLAGS="$(INCLUDES)" $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(RSRCS) ) + $(SWIG) -r $(SWIGOPT) $(INTERFACE) + +( PKG_LIBS="$(SRCS)" PKG_CPPFLAGS="$(INCLUDES)" $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(ISRCS) ) r_cpp: $(CXXSRCS) $(SWIG) -c++ -r $(SWIGOPT) -o $(RCXXSRCS) $(INTERFACE) +( PKG_LIBS="$(CXXSRCS)" PKG_CPPFLAGS="$(INCLUDES)" $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(RCXXSRCS) ) r_clean: - rm -f *_wrap* *~ .~* $(RSRCS) $(RCXXSRCS) + rm -f *_wrap* *~ .~* rm -f core @EXTRA_CLEAN@ rm -f *.@OBJEXT@ *@SO@ NAMESPACE rm -f $(RRSRC) runme.Rout .RData