fixes for changset aa6268db54db

com.oracle.truffle.r.native/builtinlibs/Makefile

@@ -33,6 +33,8 @@ endif
 
 .PHONY: all clean cleanlib cleanobj force libr
 
+all: linked $(LIB_APPL) libr
+
 SRC = src
 OBJ = lib
 LIBDIR = $(abspath $(TOPDIR)/../lib)
@@ -42,20 +44,18 @@ GNUR_LINKED_C_FILES = $(addprefix $(GNUR_HOME)/src/appl/, $(LINKED_C_FILES))
 NON_LOCAL_C_SOURCES = $(addprefix $(SRC)/, $(LINKED_C_FILES))
 C_LOCAL_SOURCES = $(filter-out  $(NON_LOCAL_C_SOURCES),$(wildcard $(SRC)/*.c))
 C_SOURCES := $(NON_LOCAL_C_SOURCES) $(C_LOCAL_SOURCES)
-$(info C_SOURCES=$(C_SOURCES))
 C_OBJECTS := $(subst $(SRC),$(OBJ),$(C_SOURCES:.c=.o))
 F_OBJECTS := $(wildcard $(GNUR_HOME)/src/appl/d*.o)
 
 LIB_APPL := $(LIBDIR)/libappl$(DYLIB_EXT)
 
-all: $(LIB_APPL) libr
-
 $(LIB_APPL): $(C_OBJECTS) $(F_OBJECTS)
 	mkdir -p $(LIBDIR)
 	$(DYLIB_LD) $(DYLIB_LDFLAGS)  -o $(LIB_APPL) $(C_OBJECTS) $(F_OBJECTS) $(LIBS)
 
-$(SRC)/$(LINKED_C_FILES): $(GNUR_LINKED_C_FILES)
+linked: $(GNUR_LINKED_C_FILES)
 	$(foreach file,$(LINKED_C_FILES),ln -sf $(GNUR_HOME)/src/appl/$(file) $(SRC)/$(file);)
+	touch linked
 
 $(C_OBJECTS): | $(OBJ)
 
@@ -97,5 +97,6 @@ cleanlib:
 clean: cleanobj cleanlibr
 
 cleanobj:
+	rm -f linked
 	rm -f $(OBJ)/*.o
 	rm -f $(SRC)/$(LINKED_C_FILES)

com.oracle.truffle.r.native/library/stats/Makefile

@@ -27,12 +27,12 @@
 # A first step in the build is to make symbolic links to those files and also to
 # do some necessary modofications to a copy of fft.c.
 
-.PHONY: cleanfft
+.PHONY: cleanpkg
 
 GNUR_FFT = $(addprefix $(GNUR_HOME)/src/library/stats/src/, fft.c)
 
-LIB_PKG_PRE = $(addprefix $(OBJ)/, $(ED_C_FILES))
-CLEAN_PKG := cleanfft
+LIB_PKG_PRE = $(addprefix $(OBJ)/, fft.o) linked
+CLEAN_PKG := cleanpkg
 
 
 # have to include this here for PKG_LIBS
@@ -51,9 +51,10 @@ GNUR_LINKED_F_FILES = $(addprefix $(GNUR_HOME)/src/library/stats/src/, $(LINKED_
 LINKED_C_FILES = isoreg.c kmeans.c loessc.c monoSpl.c sbart.c
 GNUR_LINKED_C_FILES = $(addprefix $(GNUR_HOME)/src/library/stats/src/, $(LINKED_C_FILES))
 
-$(SRC)/$(LINKED_C_FILES) $(SRC)/$(LINKED_F_FILES): $(GNUR_LINKED_F_FILES) $(GNUR_LINKED_C_FILES)
+linked: $(GNUR_LINKED_F_FILES) $(GNUR_LINKED_C_FILES)
 	$(foreach file,$(LINKED_C_FILES),ln -sf $(GNUR_HOME)/src/library/stats/src/$(file) $(SRC)/$(file);)
 	$(foreach file,$(LINKED_F_FILES),ln -sf $(GNUR_HOME)/src/library/stats/src/$(file) $(SRC)/$(file) ;)
+	touch linked
 
 # this dance ensures that C_SOURCES is set correctly regardless of whether the linked/modified files 
 # have been created or not (C_SOURCES will have been set in ../lib.mk)
@@ -70,7 +71,8 @@ $(C_OBJECTS): | $(OBJ)
 $(SRC)/fft.c: $(GNUR_FFT) src/ed_fft
 	ed $(GNUR_FFT) < src/ed_fft
 
-cleanfft:
+cleanpkg:
+	rm -f linked
 	rm -f $(SRC)/fft.c
 	rm -f $(NON_LOCAL_C_SOURCES)
 	rm -f $(addprefix $(SRC)/, $(LINKED_F_FILES))