[clhp-cvs] CVS update: clhp/Makefile clhp/ChangeLog clhp/start-clcgi.lisp
Anthony Ventimiglia
aventimiglia at common-lisp.net
Thu Nov 13 04:36:14 UTC 2003
Update of /project/clhp/cvsroot/clhp
In directory common-lisp.net:/tmp/cvs-serv25184
Modified Files:
Makefile ChangeLog
Removed Files:
start-clcgi.lisp
Log Message:
Preparing for distribution, I've removed all files and stuff needed for the old cgi based clhp, mod_clhp makes it all simpler
Date: Wed Nov 12 23:36:14 2003
Author: aventimiglia
Index: clhp/Makefile
diff -u clhp/Makefile:1.19 clhp/Makefile:1.20
--- clhp/Makefile:1.19 Wed Nov 12 22:57:03 2003
+++ clhp/Makefile Wed Nov 12 23:36:14 2003
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.19 2003/11/13 03:57:03 aventimiglia Exp $
+# $Id: Makefile,v 1.20 2003/11/13 04:36:14 aventimiglia Exp $
#
# CLHP the Common Lisp Hypertext Preprocessor
# (C) 2003 Anthony J Ventimiglia
@@ -23,15 +23,9 @@
# This is where lisp sources will be installed
SRCDIR=/usr/lib/cmucl/source/clhp
-# Directory where cmucl looks for libraries $CMUCLLIB
-# LIBDIR=/usr/lib/cmucl/lib
-
# Directory to install the clhp lisp core
COREDIR=/usr/lib/cmucl
-# Directory to add runclcgi script
-# BINDIR=/usr/local/bin
-
# Directory to install documentation
DOCDIR=/usr/local/share/clhp
@@ -61,26 +55,22 @@
LISPC=$(LISP) -noinit -load config/lispc -eval '(make)'
BUILD_CORE=config/build-core.x86f
-#BINS=start-clcgi.x86f
APACHE_MOD=mod_clhp.so
-SOURCES=cgi.lisp clhp.lisp start-clcgi.lisp package.lisp clhp.asd mod_clhp.c
+SOURCES=cgi.lisp clhp.lisp package.lisp clhp.asd mod_clhp.c
CORE=clhp.core
LISPCBIN=config/lispc.x86f
-#RUNCGI=config/runclcgi
-TESTS=config/binfmt-test.clcgi
DOCS=COPYING INSTALL ChangeLog NEWS README TODO
DIST_SUBDIRS=config examples
NON_DIST_SUBDIRS=tests
RECURSIVE_SUBDIRS = examples tests
-EXTRADIST=config/binfmt-test.lisp config/build-core.lisp config/lispc.lisp \
- config/runclcgi.src examples/Makefile examples/clhp-test.lisp \
- examples/index.clhp examples/test.lisp Makefile
+EXTRADIST=config/build-core.lisp config/lispc.lisp examples/index.clhp \
+ Makefile
NON_DIST= tests/Makefile tests/cgi-test.lisp tests/test-suite.lisp
-CLEAN_TARGETS=$(LISPCBIN) $(CORE) $(CORE).BAK $(TESTS) $(TARBALL) \
- $(APACHE_MOD) mod_clhp.o # $(RUNCGI)
+CLEAN_TARGETS=$(LISPCBIN) $(CORE) $(CORE).BAK $(TARBALL) \
+ $(APACHE_MOD) mod_clhp.o
DISTFILES=$(SOURCES) $(DOCS) $(EXTRADIST)
@@ -94,7 +84,7 @@
# makefile most likeley will not match the cvs version ID in
# clhp.lisp, since they depend on their own file's cvs date keyword.
-CVSID=$(shell echo $Date: 2003/11/13 03:57:03 $ | \
+CVSID=$(shell echo $Date: 2003/11/13 04:36:14 $ | \
awk '{print $$2}'| sed s/\\///g )cvs
VERSION=$(CVSID)
@@ -104,7 +94,7 @@
RECURSIVE_TARGETS=clean-recursive clean-all-recursive check-recursive
-all: $(LISPCBIN) $(CORE) # $(RUNCGI) $(BINS)
+all: $(LISPCBIN) $(CORE)
module:$(APACHE_MOD)
@@ -113,7 +103,7 @@
.PHONY: all install uninstall clean clean-all clean-backups install-dirs \
install-source install-source-dirs uninstall-files uninstall-dirs \
- install-core tests clean-dist $(RECURSIVE_TARGETS) check \
+ install-core clean-dist $(RECURSIVE_TARGETS) check \
module-install
%.x86f: %.lisp
@@ -122,11 +112,6 @@
%.clcgi: %.x86f
mv -v $< $@
-tests: $(TESTS)
- for file in $(TESTS); do \
- if test ! -x $$file; then $(CHMOD) -v a+x $$file ; fi \
- done
-
check: $(CORE) check-recursive
$(LISPCBIN): config/lispc.lisp
@@ -134,20 +119,11 @@
$(CORE): $(SOURCES) $(BUILD_CORE)
$(LISP) -noinit -load "config/build-core"
-# $(RUNCGI): $(RUNCGI).src
-# sed 's:\(LISP=\):\1$(LISP):' < $< | \
-# sed 's:\(CORE=\):\1$(COREDIR)/$(CORE):' | \
-# sed 's:\(CMUCLLIB=\):\1$(LIBDIR):' > $@
-
module-install: $(APACHE_MOD)
$(APXS) -i -a $<
install: all install-dirs install-core
-# for f in $(BINS) ; do \
-# $(INSTALLFILE) $$f $(LIBDIR) ; \
-# done
$(INSTALL) $(DOCS) $(DOCDIR)
-# $(INSTALL) -m0755 $(RUNCGI) $(BINDIR)
install-core: $(CORE) install-dirs
$(INSTALLFILE) -b -S .BAK $(CORE) $(COREDIR)
@@ -158,7 +134,6 @@
done
install-dirs:
-# $(INSTALLDIR) $(LIBDIR)
$(INSTALLDIR) $(COREDIR)
# $(INSTALLDIR) $(BINDIR)
$(INSTALLDIR) $(DOCDIR)
@@ -172,9 +147,6 @@
for f in $(SOURCES) ; do \
if test -f $(SRCDIR)/$$f; then rm -v $(SRCDIR)/$$f ; fi ; \
done
-# for f in $(LIBS) ; do \
-# if test -f $(LIBDIR)/$$f; then rm -v $(LIBDIR)/$$f ; fi ; \
-# done
for f in $(DOCS) ; do \
fullpath=$(DOCDIR)/$$f ; \
if test -f $$fullpath; then rm -v $$fullpath ; fi ; \
@@ -182,12 +154,9 @@
core=$(COREDIR)/$(CORE) ; \
if test -f $$core ; then rm -v $$core; fi ; \
if test -f $$core.BAK; then mv -v $$core.BAK $$core; fi
-# file=$(BINDIR)/`echo $(RUNCGI) | sed 's/config\///'` ; \
-# if test -f $$file ; then rm -v $$file; fi
uninstall-dirs: uninstall-files
-rmdir -v $(SRCDIR)
-# -rmdir -v $(LIBDIR)
-rmdir -v $(COREDIR)
-rmdir -v $(BINDIR)
-rmdir -v $(DOCDIR)
Index: clhp/ChangeLog
diff -u clhp/ChangeLog:1.25 clhp/ChangeLog:1.26
--- clhp/ChangeLog:1.25 Wed Nov 12 23:21:34 2003
+++ clhp/ChangeLog Wed Nov 12 23:36:14 2003
@@ -1,5 +1,7 @@
2003-11-12 Anthony Ventimiglia <ant at afghan.dogpound>
+ * Makefile: Removed pretty much all traces of old cgi based clhp
+
* INSTALL: Commented out LIBDIR since it does not need to be used
for new installation, rewrote for new installation
@@ -291,9 +293,9 @@
2003-09-17 16:21 <aventimiglia at common-lisp.net>
* clhp.lisp: Wrote a nice little reader macro to make cvs
- versioning automatic, the $Date: 2003/11/13 04:21:34 $ keyword is parsed to make a 8
+ versioning automatic, the $Date: 2003/11/13 04:36:14 $ keyword is parsed to make a 8
digit number YYYYMMDD with the suffix "cvs" addedd, so a CVS
- release with a $Date: 2003/11/13 04:21:34 $ of 2003/09/15 ends up with a
+ release with a $Date: 2003/11/13 04:36:14 $ of 2003/09/15 ends up with a
*CLHP-VERSION* of "20030915cvs"
2003-09-17 14:47 <aventimiglia at common-lisp.net>
@@ -302,4 +304,4 @@
that will aide in compiling lisp in a mkae freindly way by
passing a non-zero exit code when compilation fails
-$Id: ChangeLog,v 1.25 2003/11/13 04:21:34 aventimiglia Exp $
\ No newline at end of file
+$Id: ChangeLog,v 1.26 2003/11/13 04:36:14 aventimiglia Exp $
\ No newline at end of file
More information about the Clhp-cvs
mailing list