From 897b2361cb3a2b0c8175d0798e1638fc091d70a4 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 15 Apr 2013 22:07:19 +0100 Subject: [PATCH] Chicken makefiles tweaks for consistency with other languages - still more to be done though --- Examples/Makefile.in | 9 +++++++++ Examples/chicken/class/Makefile | 12 ++++++------ Examples/chicken/constants/Makefile | 10 +++++----- Examples/chicken/egg/Makefile | 10 +++++----- Examples/chicken/multimap/Makefile | 10 +++++----- Examples/chicken/overload/Makefile | 10 +++++----- Examples/chicken/simple/Makefile | 10 +++++----- 7 files changed, 40 insertions(+), 31 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 867473f91..ae71d7ba9 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1080,11 +1080,13 @@ pike_clean: CHICKEN = @CHICKEN@ CHICKEN_CSC = @CHICKEN_CSC@ +CHICKEN_CSI = @CHICKEN_CSI@ CHICKEN_LIBOPTS = @CHICKENLIB@ $(SYSLIBS) CHICKEN_SHAREDLIBOPTS = @CHICKENSHAREDLIB@ $(SYSLIBS) CHICKEN_CFLAGS = @CHICKENOPTS@ CHICKENOPTS = -quiet CHICKEN_MAIN = +CHICKEN_SCRIPT = $(RUNME).ss # SWIG produces $(ISRCS) (the C wrapper file) # and $(CHICKEN_GENERATED_SCHEME) (the Scheme wrapper file): @@ -1165,6 +1167,13 @@ chicken_cpp: chicken_externalhdr: $(SWIG) -chicken -external-runtime $(TARGET) +# ----------------------------------------------------------------- +# Run CHICKEN example +# ----------------------------------------------------------------- + +chicken_run: + $(RUNTOOL) $(CHICKEN_CSI) $(CHICKEN_SCRIPT) $(RUNPIPE) + # ----------------------------------------------------------------- # Version display # ----------------------------------------------------------------- diff --git a/Examples/chicken/class/Makefile b/Examples/chicken/class/Makefile index 1261ec5ac..976651e94 100644 --- a/Examples/chicken/class/Makefile +++ b/Examples/chicken/class/Makefile @@ -14,7 +14,11 @@ VARIANT = #CHICKEN_MAIN = test-tinyclos-class.scm #VARIANT = _static -all:: $(TARGET) $(TARGET)_proxy +check: build + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-lowlevel-class.scm + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-tinyclos-class.scm + +build: $(TARGET) $(TARGET)_proxy $(TARGET): $(INTERFACE) $(SRCS) $(MAKE) -f $(TOP)/Makefile \ @@ -28,11 +32,7 @@ $(TARGET)_proxy: $(INTERFACE) $(SRCS) INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT) -proxy' TARGET='$(TARGET)_proxy' \ SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)_cpp -clean:: +clean: $(MAKE) -f $(TOP)/Makefile chicken_clean rm -f example.scm rm -f $(TARGET) - -check:: - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-lowlevel-class.scm - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-tinyclos-class.scm diff --git a/Examples/chicken/constants/Makefile b/Examples/chicken/constants/Makefile index 81308fcf3..41ca7ae11 100644 --- a/Examples/chicken/constants/Makefile +++ b/Examples/chicken/constants/Makefile @@ -13,7 +13,10 @@ VARIANT = #CHICKEN_MAIN = test-constants.scm #VARIANT = _static -all:: $(TARGET) +check: build + csi test-constants.scm + +build: $(TARGET) $(TARGET): $(INTERFACE) $(SRCS) $(MAKE) -f $(TOP)/Makefile \ @@ -21,10 +24,7 @@ $(TARGET): $(INTERFACE) $(SRCS) INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \ SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT) -clean:: +clean: $(MAKE) -f $(TOP)/Makefile chicken_clean rm -f example.scm rm -f $(TARGET) - -check:: - csi test-constants.scm diff --git a/Examples/chicken/egg/Makefile b/Examples/chicken/egg/Makefile index bdf71b104..55aa114eb 100644 --- a/Examples/chicken/egg/Makefile +++ b/Examples/chicken/egg/Makefile @@ -1,6 +1,9 @@ SWIG = ../../../preinst-swig -all: single multi +check: build + cd eggs/install && csi ../../test.scm + +build: single multi # This creates an egg which contains only the single module. Any additional implementation files # that implement the interface being wrapped should also be added to this egg @@ -9,7 +12,7 @@ single: single_wrap.cxx tar czf eggs/single.egg single.setup single.scm single_wrap.cxx rm -f single.scm single_wrap.cxx -# complie the single module with -nounit +# compile the single module with -nounit single_wrap.cxx: single.i $(SWIG) -chicken -c++ -proxy -nounit single.i @@ -34,6 +37,3 @@ setup: mkdir -p install && \ chicken-setup -repository `pwd`/install single.egg && \ chicken-setup -repository `pwd`/install multi.egg - -check: - cd eggs/install && csi ../../test.scm diff --git a/Examples/chicken/multimap/Makefile b/Examples/chicken/multimap/Makefile index dace61a1e..4ae5a9cf3 100644 --- a/Examples/chicken/multimap/Makefile +++ b/Examples/chicken/multimap/Makefile @@ -13,7 +13,10 @@ VARIANT = #CHICKEN_MAIN = test-multimap.scm #VARIANT = _static -all:: $(TARGET) +check: build + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-multimap.scm + +build: $(TARGET) $(TARGET): $(INTERFACE) $(SRCS) $(MAKE) -f $(TOP)/Makefile \ @@ -21,10 +24,7 @@ $(TARGET): $(INTERFACE) $(SRCS) INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \ SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT) -clean:: +clean: $(MAKE) -f $(TOP)/Makefile chicken_clean rm -f example.scm rm -f $(TARGET) - -check:: - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-multimap.scm diff --git a/Examples/chicken/overload/Makefile b/Examples/chicken/overload/Makefile index 48ec43af4..584fa52a2 100644 --- a/Examples/chicken/overload/Makefile +++ b/Examples/chicken/overload/Makefile @@ -13,7 +13,10 @@ VARIANT = #CHICKEN_MAIN = test-overload.scm #VARIANT = _static -all:: $(TARGET) +check: build + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-overload.scm + +build: $(TARGET) $(TARGET): $(INTERFACE) $(SRCS) $(MAKE) -f $(TOP)/Makefile \ @@ -21,10 +24,7 @@ $(TARGET): $(INTERFACE) $(SRCS) INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \ SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)_cpp -clean:: +clean: $(MAKE) -f $(TOP)/Makefile chicken_clean rm -f example.scm rm -f $(TARGET) - -check:: - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-overload.scm diff --git a/Examples/chicken/simple/Makefile b/Examples/chicken/simple/Makefile index bb7814260..1b03497cd 100644 --- a/Examples/chicken/simple/Makefile +++ b/Examples/chicken/simple/Makefile @@ -13,7 +13,10 @@ VARIANT = #CHICKEN_MAIN = test-simple.scm #VARIANT = _static -all:: $(TARGET) +check: build + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-simple.scm + +build: $(TARGET) $(TARGET): $(INTERFACE) $(SRCS) $(MAKE) -f $(TOP)/Makefile \ @@ -21,10 +24,7 @@ $(TARGET): $(INTERFACE) $(SRCS) INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \ SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT) -clean:: +clean: $(MAKE) -f $(TOP)/Makefile chicken_clean rm -f example.scm example-generic.scm example-clos.scm rm -f $(TARGET) - -check:: - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-simple.scm