From 6c016046ad4f118ca6b0d68a046387035ee6e0f3 Mon Sep 17 00:00:00 2001 From: Didier Verna Date: Sat, 23 Oct 2010 06:03:26 +0200 Subject: [PATCH] Demo renamings. ChangeLog addition: 2010-10-23 Didier Verna * Makefile (demos): Rename from demo. * .gitignore: * Makefile (SUBDIRS): * INSTALL: Update accordingly. demos/ ChangeLog addition: 2010-10-23 Didier Verna * simple.lisp: Rename from demo.lisp. Output to simple. * Makefile: Update accordingly. --- .gitignore | 4 ++-- INSTALL | 10 +++++----- Makefile | 8 ++++---- {demo => demos}/Makefile | 2 +- {demo => demos}/advanced.lisp | 0 demo/demo.lisp => demos/simple.lisp | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) rename {demo => demos}/Makefile (98%) rename {demo => demos}/advanced.lisp (100%) rename demo/demo.lisp => demos/simple.lisp (99%) diff --git a/.gitignore b/.gitignore index 74afae7..5036426 100644 --- a/.gitignore +++ b/.gitignore @@ -2,8 +2,8 @@ sbcl-*/ version.inc -demo/demo -demo/advanced +demos/simple +demos/advanced sbcl/foo.c sbcl/constants.lisp-temp diff --git a/INSTALL b/INSTALL index 4f80695..d42d7cb 100644 --- a/INSTALL +++ b/INSTALL @@ -8,12 +8,12 @@ The Clon distribution has the following shape: ./sbcl/ ;; SBCL grovel module ./share/ ;; data files ./doc/ ;; documentation -./demo/ ;; demo program +./demos/ ;; demo programs * Configuration -You may need to edit Makefile.cnf, demo/demo.lisp and doc/generate.sh in order -to tweak some installation parameters. +You may need to edit Makefile.cnf, demos/simple.lisp, demos/advanced.lisp and +doc/generate.sh in order to tweak some installation parameters. * Building and installing @@ -28,8 +28,8 @@ Typing "make install" will install both the documentation and the data files. If you're using ASDF 1, you will want to "make install-system" in order to create the system file symlink where appropriate. -If you want to compile the demo program, type "make demo". This program is not -installed anywhere. +If you want to compile the demo programs, type "make demos". These programs +are not installed anywhere. * Building and installing the reference manual diff --git a/Makefile b/Makefile index 38f2673..ddc8154 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ include version.inc SUBDIRS := src sbcl \ share doc \ - demo + demos SYSTEMS_DIR := $(SHARE)/common-lisp/systems ASDF_FILE := com.dvlsoft.clon.asd @@ -53,8 +53,8 @@ TARBALL := $(DIST_NAME).tar.gz SIGNATURE := $(TARBALL).asc -demo: # needed because we have a demo/ directory which fucks up the target. - cd demo && $(MAKE) demo +demos: # needed because we have a demos/ directory which fucks up the target. + cd demos && $(MAKE) demos install-system: ln -fs "`pwd`/$(ASDF_FILE)" "$(SYSTEMS_DIR)/" @@ -117,7 +117,7 @@ $(SIGNATURE): $(TARBALL) .DEFAULT: $(MAKE) gen TARGET=$@ -.PHONY: all demo \ +.PHONY: all demos \ install-system \ uninstall \ clean distclean \ diff --git a/demo/Makefile b/demos/Makefile similarity index 98% rename from demo/Makefile rename to demos/Makefile index 4bc5817..6fd39b1 100644 --- a/demo/Makefile +++ b/demos/Makefile @@ -38,7 +38,7 @@ all: include $(TOP_DIR)/Makefile.inc -DEMOS := demo advanced +DEMOS := simple advanced demos: $(DEMOS) diff --git a/demo/advanced.lisp b/demos/advanced.lisp similarity index 100% rename from demo/advanced.lisp rename to demos/advanced.lisp diff --git a/demo/demo.lisp b/demos/simple.lisp similarity index 99% rename from demo/demo.lisp rename to demos/simple.lisp index 3c2b60c..0fa911b 100644 --- a/demo/demo.lisp +++ b/demos/simple.lisp @@ -117,7 +117,7 @@ Possible values are yes, no or try. If try, no errors are reported." (clon:exit)) ;; #### PORTME. -(save-lisp-and-die "demo" +(save-lisp-and-die "simple" :toplevel #'main :executable t :save-runtime-options t) -- 2.11.4.GIT