summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorMartin Grabmüller <mgrabmue@cs.tu-berlin.de>2001-07-26 05:31:57 +0000
committerMartin Grabmüller <mgrabmue@cs.tu-berlin.de>2001-07-26 05:31:57 +0000
commit67b7dd9ea9aad459d77785766da3a8e3607ce2ab (patch)
tree57a3b31eed77a90237ed58b78e655f703d0f12b4 /examples
parent3c3db1289a7f2578c1505c5385d3052649d8f42f (diff)
Minor typo fix in NEWS.
Examples are now built and tested on `make installcheck'.
Diffstat (limited to 'examples')
-rw-r--r--examples/ChangeLog61
-rw-r--r--examples/box-dynamic-module/Makefile.am15
-rw-r--r--examples/box-dynamic/Makefile.am15
-rw-r--r--examples/box-module/Makefile.am13
-rw-r--r--examples/box/Makefile.am13
-rw-r--r--examples/modules/Makefile.am5
-rw-r--r--examples/safe/Makefile.am5
-rw-r--r--examples/scripts/Makefile.am11
8 files changed, 114 insertions, 24 deletions
diff --git a/examples/ChangeLog b/examples/ChangeLog
index d7a556d59..f70742449 100644
--- a/examples/ChangeLog
+++ b/examples/ChangeLog
@@ -1,3 +1,64 @@
+2001-07-24 Martin Grabmueller <mgrabmue@cs.tu-berlin.de>
+
+ All examples are now built and tested on `make installcheck'
+ rather than `make check'.
+
+2001-07-19 Martin Grabmueller <mgrabmue@cs.tu-berlin.de>
+
+ * box-dynamic-module/Makefile.am, box-dynamic/Makefile.am,
+ box-module/Makefile.am, box/Makefile.am: Use $(top_srcdir) to get
+ at GUILE_LOAD_PATH, and $(top_builddir) for the guile and
+ guile-config programs and for the link paths. Add check.test to
+ EXTRA_DIST.
+
+ * box-dynamic-module/Makefile.am, box-dynamic/Makefile.am,
+ box-module/Makefile.am, box/Makefile.am: Add -L../../qt to LIBS.
+
+2001-07-19 Rob Browning <rlb@defaultvalue.org>
+
+ * box-module/.cvsignore: add .deps
+
+ * box/.cvsignore: add .deps.
+
+2001-07-17 Martin Grabmueller <mgrabmue@cs.tu-berlin.de>
+
+ * box-module/Makefile.am (TESTS): New variable.
+ Create `box' on `make all'.
+
+ * box-module/check.test, box-dynamic-module/check.test,
+ * box-dynamic/check.test: New files.
+
+ * box-dynamic/Makefile.am (libbox): Create box library on `make
+ all'.
+ (TESTS): New variable.
+
+ * box/Makefile.am (TESTS): New variable.
+ Create `box' program on `make all', use freshly built Guile for
+ building.
+
+ * box/check.test: New file.
+
+ * modules/check.test, safe/check.test, scripts/check.test: Set
+ GUILE_LOAD_PATH to make the tests run without installed Guile.
+
+2001-07-16 Thien-Thi Nguyen <ttn@revel.glug.org>
+
+ * scripts/check.test: Add check for guile interpreter.
+ Fix bug: Use `$guile' everywhere. Thanks to Martin Grabmueller.
+
+2001-07-16 Martin Grabmueller <mgrabmue@cs.tu-berlin.de>
+
+ * modules/check.test, safe/check.test: New files.
+
+ * modules/Makefile.am (TESTS), safe/Makefile.am (TESTS): New
+ variables.
+
+2001-07-14 Thien-Thi Nguyen <ttn@revel.glug.org>
+
+ * scripts/check.test: New file.
+
+ * Makefile.am (TESTS): New var.
+
2001-07-14 Martin Grabmueller <mgrabmue@cs.tu-berlin.de>
* modules/main: Use :renamer for specifying renaming procedure.
diff --git a/examples/box-dynamic-module/Makefile.am b/examples/box-dynamic-module/Makefile.am
index 4d7df0210..665a7de54 100644
--- a/examples/box-dynamic-module/Makefile.am
+++ b/examples/box-dynamic-module/Makefile.am
@@ -19,13 +19,18 @@
## to the Free Software Foundation, Inc., 59 Temple Place, Suite
## 330, Boston, MA 02111-1307 USA
-EXTRA_DIST = README box.c box-module.scm box-mixed.scm
+EXTRA_DIST = README box.c box-module.scm box-mixed.scm check.test
-CFLAGS=`guile-config compile`
-LIBS=`guile-config link`
+CFLAGS=`$(bindir)/guile-config compile`
+LIBS=`$(bindir)/guile-config link`
libbox-module: box.lo
- sh ../../libtool --mode=link $(CC) $< $(LIBS) -rpath $(prefix)/lib -o libbox-module.la
+ sh ../../libtool --mode=link $(CC) $< $(LIBS) -rpath $(libdir) -o libbox-module.la
box.lo: box.c
- sh ../../libtool --mode=compile $(CC) $(CFLAGS) -c $< \ No newline at end of file
+ sh ../../libtool --mode=compile $(CC) $(CFLAGS) -c $<
+
+installcheck: libbox-module
+ LTDL_LIBRARY_PATH=.libs GUILE_LOAD_PATH=$(top_srcdir):$(srcdir) $(srcdir)/check.test
+
+CLEANFILES=libbox-module.la box.lo box.o
diff --git a/examples/box-dynamic/Makefile.am b/examples/box-dynamic/Makefile.am
index 7bb9f46c2..574eadb85 100644
--- a/examples/box-dynamic/Makefile.am
+++ b/examples/box-dynamic/Makefile.am
@@ -19,13 +19,18 @@
## to the Free Software Foundation, Inc., 59 Temple Place, Suite
## 330, Boston, MA 02111-1307 USA
-EXTRA_DIST = README box.c
+EXTRA_DIST = README box.c check.test
-CFLAGS=`guile-config compile`
-LIBS=`guile-config link`
+CFLAGS=`$(bindir)/guile-config compile`
+LIBS=`$(bindir)/guile-config link`
libbox: box.lo
- sh ../../libtool --mode=link $(CC) $< $(LIBS) -rpath $(prefix)/lib -o libbox.la
+ sh ../../libtool --mode=link $(CC) $< $(LIBS) -rpath $(libdir) -o libbox.la
box.lo: box.c
- sh ../../libtool --mode=compile $(CC) $(CFLAGS) -c $< \ No newline at end of file
+ sh ../../libtool --mode=compile $(CC) $(CFLAGS) -c $<
+
+installcheck: libbox
+ LTDL_LIBRARY_PATH=.libs GUILE_LOAD_PATH=$(top_srcdir):$(srcdir) $(srcdir)/check.test
+
+CLEANFILES=libbox.la box.lo box.o
diff --git a/examples/box-module/Makefile.am b/examples/box-module/Makefile.am
index 3e1f92032..3fe82e7cd 100644
--- a/examples/box-module/Makefile.am
+++ b/examples/box-module/Makefile.am
@@ -19,13 +19,18 @@
## to the Free Software Foundation, Inc., 59 Temple Place, Suite
## 330, Boston, MA 02111-1307 USA
-EXTRA_DIST = README box.c
+EXTRA_DIST = README box.c check.test
-CFLAGS=`guile-config compile`
-LIBS=`guile-config link`
+CFLAGS=`$(bindir)/guile-config compile`
+LIBS=`$(bindir)/guile-config link`
box: box.o
$(CC) $< $(LIBS) -o box
box.o: box.c
- $(CC) $(CFLAGS) -c $< \ No newline at end of file
+ $(CC) $(CFLAGS) -c $<
+
+installcheck: box
+ LD_LIBRARY_PATH=$(libdir) GUILE_LOAD_PATH=$(top_srcdir) $(srcdir)/check.test
+
+CLEANFILES=box box.o
diff --git a/examples/box/Makefile.am b/examples/box/Makefile.am
index 3e1f92032..3fe82e7cd 100644
--- a/examples/box/Makefile.am
+++ b/examples/box/Makefile.am
@@ -19,13 +19,18 @@
## to the Free Software Foundation, Inc., 59 Temple Place, Suite
## 330, Boston, MA 02111-1307 USA
-EXTRA_DIST = README box.c
+EXTRA_DIST = README box.c check.test
-CFLAGS=`guile-config compile`
-LIBS=`guile-config link`
+CFLAGS=`$(bindir)/guile-config compile`
+LIBS=`$(bindir)/guile-config link`
box: box.o
$(CC) $< $(LIBS) -o box
box.o: box.c
- $(CC) $(CFLAGS) -c $< \ No newline at end of file
+ $(CC) $(CFLAGS) -c $<
+
+installcheck: box
+ LD_LIBRARY_PATH=$(libdir) GUILE_LOAD_PATH=$(top_srcdir) $(srcdir)/check.test
+
+CLEANFILES=box box.o
diff --git a/examples/modules/Makefile.am b/examples/modules/Makefile.am
index 35988c545..a6a9e0e03 100644
--- a/examples/modules/Makefile.am
+++ b/examples/modules/Makefile.am
@@ -19,4 +19,7 @@
## to the Free Software Foundation, Inc., 59 Temple Place, Suite
## 330, Boston, MA 02111-1307 USA
-EXTRA_DIST = README module-0.scm module-1.scm module-2.scm main
+EXTRA_DIST = README module-0.scm module-1.scm module-2.scm main check.test
+
+installcheck:
+ srcdir=$(srcdir) GUILE_LOAD_PATH=$(top_srcdir):$(srcdir) $(srcdir)/check.test
diff --git a/examples/safe/Makefile.am b/examples/safe/Makefile.am
index cf41df73f..16c2f1687 100644
--- a/examples/safe/Makefile.am
+++ b/examples/safe/Makefile.am
@@ -19,4 +19,7 @@
## to the Free Software Foundation, Inc., 59 Temple Place, Suite
## 330, Boston, MA 02111-1307 USA
-EXTRA_DIST = README safe untrusted.scm evil.scm
+EXTRA_DIST = README safe untrusted.scm evil.scm check.test
+
+installcheck:
+ srcdir=$(srcdir) GUILE_LOAD_PATH=$(top_srcdir) $(srcdir)/check.test
diff --git a/examples/scripts/Makefile.am b/examples/scripts/Makefile.am
index ff6173086..3a82dad77 100644
--- a/examples/scripts/Makefile.am
+++ b/examples/scripts/Makefile.am
@@ -3,20 +3,23 @@
## Copyright (C) 2001 Free Software Foundation, Inc.
##
## This file is part of GUILE.
-##
+##
## GUILE is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as
## published by the Free Software Foundation; either version 2, or
## (at your option) any later version.
-##
+##
## GUILE is distributed in the hope that it will be useful, but
## WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
-##
+##
## You should have received a copy of the GNU General Public
## License along with GUILE; see the file COPYING. If not, write
## to the Free Software Foundation, Inc., 59 Temple Place, Suite
## 330, Boston, MA 02111-1307 USA
-EXTRA_DIST = README simple-hello.scm hello fact
+EXTRA_DIST = README simple-hello.scm hello fact check.test
+
+installcheck:
+ srcdir=$(srcdir) GUILE_LOAD_PATH=$(top_srcdir) $(srcdir)/check.test