[clhp-cvs] CVS update: clhp/Makefile clhp/ChangeLog

[Anthony Ventimiglia]

Update of /project/clhp/cvsroot/clhp
In directory common-lisp.net:/tmp/cvs-serv27338

Modified Files:
	Makefile ChangeLog 
Log Message:
Addedd rules for mod_clhp, but it will not yet be
included in the real distribution, also removed tests/ from dist
tarball.

Date: Thu Oct 30 21:27:12 2003
Author: aventimiglia

Index: clhp/Makefile
diff -u clhp/Makefile:1.15 clhp/Makefile:1.16
--- clhp/Makefile:1.15	Fri Oct 17 08:58:04 2003
+++ clhp/Makefile	Thu Oct 30 21:27:11 2003
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.15 2003/10/17 12:58:04 aventimiglia Exp $
+# $Id: Makefile,v 1.16 2003/10/31 02:27:11 aventimiglia Exp $
 #
 # CLHP the Common Lisp Hypertext Preprocessor
 # (C) 2003 Anthony J Ventimiglia
@@ -47,6 +47,9 @@
 # path to tar
 TAR=/bin/tar
 
+# path to apxs
+APXS=/usr/sbin/apxs
+
 DIRMODE=0775 	# mode for cmucl dirs
 FMODE=0664	# mode for installed files
 
@@ -59,19 +62,25 @@
 
 BUILD_CORE=config/build-core.x86f
 BINS=start-clcgi.x86f
-SOURCES=cgi.lisp clhp.lisp start-clcgi.lisp package.lisp clhp.asd
+APACHE_MOD=mod_clhp.so
+SOURCES=cgi.lisp clhp.lisp start-clcgi.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 
 
-SUBDIRS=config examples tests
+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 tests/Makefile \
-	tests/cgi-test.lisp tests/test-suite.lisp
+	examples/index.clhp examples/test.lisp Makefile
+
+NON_DIST= tests/Makefile tests/cgi-test.lisp tests/test-suite.lisp
+
+CLEAN_TARGETS=$(LISPCBIN) $(CORE) $(CORE).BAK $(RUNCGI) $(TESTS) $(TARBALL) \
+		 $(APACHE_MOD) mod_clhp.o
 
 DISTFILES=$(SOURCES) $(DOCS) $(EXTRADIST)
 
@@ -85,7 +94,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/10/17 12:58:04 $ | \
+CVSID=$(shell echo $Date: 2003/10/31 02:27:11 $ | \
 	awk '{print $$2}'| sed s/\\///g )cvs
 
 VERSION=$(CVSID)
@@ -97,9 +106,15 @@
 
 all: $(LISPCBIN) $(CORE) $(RUNCGI) $(BINS)
 
+module:$(APACHE_MOD)
+
+$(APACHE_MOD): mod_clhp.c
+	$(APXS) -c $<
+
 .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 tests clean-dist $(RECURSIVE_TARGETS) check \
+	 module-install
 
 %.x86f: %.lisp
 	$(LISPC) $<
@@ -124,6 +139,9 @@
 	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) ; \
@@ -179,7 +197,7 @@
 $(TARBALL): $(DISTFILES)
 	distdir=clhp-$(VERSION) ; \
 	if test ! -d $$distdir; then mkdir -v $$distdir ; fi ; \
-	for dir in $(SUBDIRS); do \
+	for dir in $(DIST_SUBDIRS); do \
 		if test ! -d $$distdir/$$dir; then \
 			 mkdir -v $$distdir/$$dir ; \
 		fi ; \
@@ -195,8 +213,7 @@
 clean-all: clean-all-recursive clean clean-backups clean-dist 
 
 clean: clean-recursive
-	for f in $(LISPCBIN) $(CORE) $(CORE).BAK $(RUNCGI) \
-		$(TESTS) $(TARBALL); \
+	for f in $(CLEAN_TARGETS); \
 	 do \
 		if test -f $$f ; then rm -v $$f ; fi \
 	done


Index: clhp/ChangeLog
diff -u clhp/ChangeLog:1.19 clhp/ChangeLog:1.20
--- clhp/ChangeLog:1.19	Tue Oct 21 12:57:27 2003
+++ clhp/ChangeLog	Thu Oct 30 21:27:12 2003
@@ -1,3 +1,13 @@
+2003-10-30    <ant at afghan.dogpound>
+
+	* Makefile: Addedd rules for mod_clhp, but it will not yet be
+	included in the real distribution, also removed tests/ from dist
+	tarball.
+
+2003-10-29    <ant at afghan.dogpound>
+
+	* mod_clhp.c (Handler): Beginning work on Apache module
+
 2003-10-21    <ant at afghan.dogpound>
 
 	* cgi.lisp (*QUERY-VARS*): Fixed so test is #'equal, which will
@@ -121,4 +131,4 @@
 	used to create tables from (CONS . TYPE) a-lists. Also added some
 	comments.
 
-$Id: ChangeLog,v 1.19 2003/10/21 16:57:27 aventimiglia Exp $
\ No newline at end of file
+$Id: ChangeLog,v 1.20 2003/10/31 02:27:12 aventimiglia Exp $
\ No newline at end of file