[SCM] Lisaac compiler branch, stable, updated. lisaac-0.12-596-g866a2a2

[Mildred Ki'Lya]

The following commit has been merged in the stable branch:
commit c219c06efa2e280477fef7adb908614976ef408b
Author: Mildred Ki'Lya <silkensedai at online.fr>
Date:   Wed Nov 11 13:33:08 2009 +0100

    Update Makefile to add an help message

diff --git a/.gitignore b/.gitignore
index c1f0de7..18e833e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,10 @@
 /src/path.h
 /path.h
 /lisaac
+/lisaac.exe
 /lisaac.c
+/install_lisaac
+/install_lisaac.exe
 /l
 /l.c
 /doc/
diff --git a/Makefile b/Makefile
index dd72233..3ccaff3 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@
 #  values suit your needs. This option is used in order to install lisaac in a
 #  non-userland way.
 #
-#  - interactive_userland  Starts the installer in userland interactive mode
+#  - user                  Starts the installer in userland interactive mode
 #
 #  - install               Copy all files in a proper place (non-userland)
 #
@@ -92,8 +92,42 @@ CFLAGS=-O3
 DIST_NAME=$(PROJECT)-$(VERSION_FULL)
 export LISAAC_DIRECTORY=..
 
+
+help:
+	@echo "----------------------------------------------------------------"
+	@echo "--               Lisaac IS An Advanced Compiler               --"
+	@echo "--            LORIA - LSIIT - ULP - CNRS - FRANCE             --"
+	@echo "--         Benoit SONNTAG - sonntag at icps.u-strasbg.fr         --"
+	@echo "--                   http://www.lisaac.org/                   --"
+	@echo "----------------------------------------------------------------"
+	@echo "  make help      - display this help message"
+	@echo ""
+	@echo ""
+	@echo "Quick installation:"
+	@echo ""
+	@echo "  make user      - compile the installer and run it"
+	@echo ""
+	@echo "For packagers:"
+	@echo ""
+	@echo "  make install   - install everything"
+	@echo "  make uninstall - uninstall everything"
+	@echo "  make dist      - create a package with the sources only"
+	@echo "  make distclean - clean the source directory"
+	@echo ""
+	@echo "For developpers:"
+	@echo ""
+	@echo "  make all       - compile the compiler, the shorter and the"
+	@echo "                   documentation"
+	@echo "  make doc       - create documentation for the library"
+	@echo "  make bootstrap - bootstrap the compiler"
+	@echo "  make check     - check the bootstrap (probably broken)"
+	@echo "  make clean     - clean the source directory"
+	@echo ""
+
 all: bin/lisaac bin/shorter doc
 
+.PHONY: all bootstrap check doc user install uninstall clean dist distclean help
+
 bootstrap/path.h:
 	mkdir bootstrap
 	@echo "#define LISAAC_DIRECTORY \"..\"" > bootstrap/path.h
@@ -127,11 +161,12 @@ doc/html: bin/shorter lib
 	mkdir -p doc/html
 	cd doc && ../bin/shorter -d -f belinda ../lib -o html 
 
-interactive_userland: install_lisaac.c
-	@echo - Lisaac compiler installation For Unix / Linux / Windows -
-	@echo Please wait...
+user: install_lisaac.c
+	@echo "- Lisaac compiler installation For Unix / Linux / Windows -"
+	@echo "Please wait..."
 	$(CC) $(CFLAGS) install_lisaac.c -o install_lisaac
-	@echo - please run ./install_lisaac to finish the installation
+	@echo "- please run ./install_lisaac to finish the installation"
+	./install_lisaac
 
 install: bin/lisaac bin/shorter
 	mkdir -p $(DESTDIR)$(LIB) 
@@ -160,6 +195,7 @@ clean:
 	-rm -f bin/lisaac
 	-rm -f bin/shorter bin/shorter.c
 	-rm -rf doc
+	find . -name "*.orig" -o -name "*.BACKUP.*" -o -name "*.BASE.*" -o -name "*.LOCAL.*" -o -name "*.REMOTE.*" | xargs rm
 
 dist: clean
 	if ! test -d $(DIST_NAME) ; then mkdir $(DIST_NAME) ; fi

-- 
Lisaac compiler