Guile example makefiles tweaks for consistency with other languages. 'make check' still incomplete.

8 files changed, 34 insertions, 36 deletions

diff --git a/Examples/guile/Makefile.in b/Examples/guile/Makefile.in
index a11095599..9e6f9f6c6 100644
--- a/Examples/guile/Makefile.in
+++ b/Examples/guile/Makefile.in
@@ -19,7 +19,7 @@ SO		= @SO@
 all:
 	for d in $(subdirs) ; do (cd $$d ; $(MAKE)) ; done
 
-clean::
+clean:
 	for d in $(subdirs) ; do (cd $$d ; $(MAKE) clean) ; done
 	rm -f *~ .~*
 
@@ -29,11 +29,11 @@ guile_clean:
 # This is meant to be used w/ "make -f ../Makefile" from subdirs.
 # Doesn't make sense to use it from here.
 
-sub-all::
+sub-all:
 	$(SWIG) -guile $(SWIGOPT) $(IFILE)
 	$(CC) $(CFLAGS) -o $(TARGET) $(SRCS) $(WRAP) $(GUILEINCLUDE) $(GUILELINK)
 
-sub-all-cxx::
+sub-all-cxx:
 	$(SWIG) -c++ -guile $(SWIGOPT) $(IFILE)
 	$(CXX) $(CFLAGS) -o $(TARGET) $(SRCS) $(CXXWRAP) $(GUILEINCLUDE) $(GUILELINK)
 
diff --git a/Examples/guile/constants/Makefile b/Examples/guile/constants/Makefile
index 70243c75e..946323b89 100644
--- a/Examples/guile/constants/Makefile
+++ b/Examples/guile/constants/Makefile
@@ -3,15 +3,15 @@ TARGET = my-guile
 IFILE  = example.i
 MKDIR  = ..
 
-all::
+check: build
+	./my-guile -s constants.scm
+
+build:
 	$(MAKE) -f $(MKDIR)/Makefile		\
 		SRCS='$(SRCS)'			\
 		TARGET=$(TARGET)		\
 		IFILE=$(IFILE)			\
 	    sub-all
 
-clean::
+clean:
 	$(MAKE) -f $(MKDIR)/Makefile TARGET='$(TARGET)' guile_clean
-
-check: all
-	./my-guile -s constants.scm
diff --git a/Examples/guile/matrix/Makefile b/Examples/guile/matrix/Makefile
index 5df2c6515..551debe06 100644
--- a/Examples/guile/matrix/Makefile
+++ b/Examples/guile/matrix/Makefile
@@ -3,8 +3,9 @@ TARGET = matrix
 IFILE  = package.i
 MKDIR  = ..
 
+check: build
 
-all::
+build:
 	$(MAKE) -f $(MKDIR)/Makefile		\
 		SRCS='$(SRCS)'			\
 		TARGET=$(TARGET)		\
@@ -12,7 +13,5 @@ all::
 		MODULE=$(MODULE)		\
 	  sub-all
 
-clean::
+clean:
 	$(MAKE) -f $(MKDIR)/Makefile TARGET='$(TARGET)' guile_clean
-
-check: all
diff --git a/Examples/guile/multimap/Makefile b/Examples/guile/multimap/Makefile
index dc9c66d1f..00fa5df28 100644
--- a/Examples/guile/multimap/Makefile
+++ b/Examples/guile/multimap/Makefile
@@ -4,15 +4,15 @@ SRCS       = example.c
 TARGET     = example
 INTERFACE  = example.i
 
-all::
+check: build
+
+build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' guile
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='my-guile' INTERFACE='$(INTERFACE)' guile_static
 
-clean::
+clean:
 	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_clean
-
-check: all
diff --git a/Examples/guile/multivalue/Makefile b/Examples/guile/multivalue/Makefile
index dc9c66d1f..00fa5df28 100644
--- a/Examples/guile/multivalue/Makefile
+++ b/Examples/guile/multivalue/Makefile
@@ -4,15 +4,15 @@ SRCS       = example.c
 TARGET     = example
 INTERFACE  = example.i
 
-all::
+check: build
+
+build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' guile
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='my-guile' INTERFACE='$(INTERFACE)' guile_static
 
-clean::
+clean:
 	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_clean
-
-check: all
diff --git a/Examples/guile/port/Makefile b/Examples/guile/port/Makefile
index 824f3f823..2d81f44ca 100644
--- a/Examples/guile/port/Makefile
+++ b/Examples/guile/port/Makefile
@@ -3,8 +3,9 @@ TARGET = port
 IFILE  = port.i
 MKDIR  = ..
 
+check: build
 
-all::
+build:
 	$(MAKE) -f $(MKDIR)/Makefile		\
 		SRCS='$(SRCS)'			\
 		TARGET=$(TARGET)		\
@@ -12,7 +13,5 @@ all::
 		MODULE=$(MODULE)		\
 	  sub-all
 
-clean::
+clean:
 	$(MAKE) -f $(MKDIR)/Makefile TARGET='$(TARGET)' guile_clean
-
-check: all
diff --git a/Examples/guile/simple/Makefile b/Examples/guile/simple/Makefile
index 702b5bb96..d4021073e 100644
--- a/Examples/guile/simple/Makefile
+++ b/Examples/guile/simple/Makefile
@@ -3,7 +3,10 @@ TARGET = my-guile
 IFILE  = example.i
 MKDIR  = ..
 
-all: $(TARGET)
+check: $(TARGET)
+	./$(TARGET) -s example.scm
+
+build: $(TARGET)
 
 $(TARGET):
 	$(MAKE) -f $(MKDIR)/Makefile		\
@@ -12,8 +15,5 @@ $(TARGET):
 		IFILE=$(IFILE)			\
 	    sub-all
 
-clean::
+clean:
 	$(MAKE) -f $(MKDIR)/Makefile TARGET='$(TARGET)' guile_clean
-
-check: $(TARGET)
-	./$(TARGET) -s example.scm > /dev/null
diff --git a/Examples/guile/std_vector/Makefile b/Examples/guile/std_vector/Makefile
index 2733fb017..08bf82c87 100644
--- a/Examples/guile/std_vector/Makefile
+++ b/Examples/guile/std_vector/Makefile
@@ -4,15 +4,15 @@ SRCS       =
 TARGET     = example
 INTERFACE  = example.i
 
-all::
+check: build
+
+build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' guile_cpp
 
-static::
+static:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='my-guile' INTERFACE='$(INTERFACE)' guile_static_cpp
 
-clean::
+clean:
 	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_clean
-
-check: all