R examples makefile tidyup

This commit is contained in:
William S Fulton 2013-04-13 22:12:21 +01:00
commit bfb695c512
3 changed files with 19 additions and 11 deletions

View file

@ -1359,6 +1359,7 @@ R = R
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_CFLAGS=-fPIC
R_SCRIPT=$(RUNME).R
# need to compile .cxx files outside of R build system to make sure that
# we get -fPIC
@ -1386,6 +1387,13 @@ ifneq ($(CXXSRCS),)
endif
+( PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(RCXXSRCS) $(OBJS) > /dev/null )
# -----------------------------------------------------------------
# Run R example
# -----------------------------------------------------------------
r_run:
$(RUNTOOL) $(R) CMD BATCH $(R_SCRIPT) $(RUNPIPE)
# -----------------------------------------------------------------
# Version display
# -----------------------------------------------------------------
@ -1401,7 +1409,7 @@ r_clean:
rm -f *_wrap* *~ .~*
rm -f core @EXTRA_CLEAN@
rm -f *.@OBJEXT@ *@SO@ NAMESPACE
rm -f $(RRSRC) runme.Rout .RData
rm -f $(RRSRC) $(RUNME).Rout .RData
##################################################################
##### Go ######

View file

@ -4,12 +4,12 @@ CXXSRCS = example.cxx
TARGET = example
INTERFACE = example.i
all::
check: build
$(MAKE) -f $(TOP)/Makefile r_run
build:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' r_cpp
clean::
clean:
$(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' r_clean
check: all
R CMD BATCH runme.R

View file

@ -4,12 +4,12 @@ SRCS = example.c
TARGET = example
INTERFACE = example.i
all::
check: build
$(MAKE) -f $(TOP)/Makefile r_run
build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' r
clean::
clean:
$(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' r_clean
check: all
R CMD BATCH runme.R