for review: WWW Makefile changes

[Peter David ROSS]

Hi,

Tyson more stuff to review.


===================================================================


Estimated hours taken: 0.75

Add the targets html and all.

make html:
    Only makes the html generated from php3 (the quick way).

make all:
    makes all the html files (the slow way).

Makefile:
Makefile.common:
contact/Makefile:
download/Makefile:
information/Makefile:
mailing-lists/Makefile:
mailing-lists/mercury-developers/Makefile:
mailing-lists/mercury-users/Makefile:


Index: Makefile
===================================================================
RCS file: /home/staff/zs/imp/w3/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	1998/09/04 06:52:39	1.3
+++ Makefile	1998/09/04 06:55:56
@@ -15,7 +15,8 @@
 
 #-----------------------------------------------------------------------------#
 
-target: all
+target: html
+
 index.html: latest_news.inc newsdb.inc
 news.html: latest_news.inc newsdb.inc
 
Index: Makefile.common
===================================================================
RCS file: /home/staff/zs/imp/w3/Makefile.common,v
retrieving revision 1.3
diff -u -r1.3 Makefile.common
--- Makefile.common	1998/09/04 06:52:41	1.3
+++ Makefile.common	1998/09/04 06:54:42
@@ -16,9 +16,27 @@
 
 #-----------------------------------------------------------------------------#
 
+#-----------------------------------------------------------------------------#
 
+
+.PHONY: html
+html: $(HTML)
+ifdef DIRS
+	for dir in $(DIRS); 				\
+	do 						\
+		(cd $$dir; $(MAKE) html); 		\
+	done
+endif
+
 .PHONY: all
-all: subdirs $(HTML)
+all: $(HTML)
+ifdef DIRS
+	for dir in $(DIRS); 				\
+	do 						\
+		(cd $$dir; $(MAKE) all); 		\
+	done
+endif
+
 
 .PHONY: install
 install: $(HTML)
@@ -46,15 +64,6 @@
 .PHONY: touch
 touch:
 	touch *.php3
-
-.PHONY: subdirs
-subdirs:
-ifdef DIRS
-	for dir in $(DIRS); 		\
-	do 				\
-		(cd $$dir; $(MAKE)); 	\
-	done
-endif
 
 #-----------------------------------------------------------------------------#
 
Index: contact/Makefile
===================================================================
RCS file: /home/staff/zs/imp/w3/contact/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile	1998/09/01 02:41:58	1.1.1.1
+++ Makefile	1998/09/04 06:11:39
@@ -1,4 +1,4 @@
-target: all
+target: html
 
 HTML= 	email.html 		\
 	people.html
Index: download/Makefile
===================================================================
RCS file: /home/staff/zs/imp/w3/download/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile	1998/09/01 02:41:47	1.1.1.1
+++ Makefile	1998/09/04 06:47:13
@@ -1,4 +1,4 @@
-target: all
+target: html
 
 ROOT=..
 HTML= 	current-release-bugs.html	\
Index: information/Makefile
===================================================================
RCS file: /home/staff/zs/imp/w3/information/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	1998/09/04 06:52:58	1.4
+++ Makefile	1998/09/04 06:54:50
@@ -1,4 +1,4 @@
-target: all local
+target: html
 
 ROOT=..
 HTML= 	benchmarks.html 	\
@@ -9,6 +9,7 @@
 	papers.html		\
 	related.html
 
+all:     local
 install: local_install
 clean:   local_clean
 
@@ -27,7 +28,7 @@
 	cp -a mercury-doc/*.ps doc
 	(cd doc; gzip -f -9 *.ps)
 
-local_install: target
+local_install: all
 	for dir in bench developers doc papers;		\
 	do						\
 		cp -a $$dir $(INSTALL_WEBDIR);		\
Index: mailing-lists/Makefile
===================================================================
RCS file: /home/staff/zs/imp/w3/mailing-lists/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile	1998/09/01 02:41:02	1.1.1.1
+++ Makefile	1998/09/04 06:48:06
@@ -1,4 +1,4 @@
-target: all
+target: html
 
 HTML= 	mailing-lists.html
 DIRS=mercury-users mercury-developers
Index: mailing-lists/mercury-developers/Makefile
===================================================================
RCS file: /home/staff/zs/imp/w3/mailing-lists/mercury-developers/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	1998/09/04 05:02:17	1.3
+++ Makefile	1998/09/04 06:16:14
@@ -1,4 +1,4 @@
-target: all
+target: html
 
 HTML=	list.html 
 DIRS=
@@ -8,7 +8,7 @@
 
 install: local_install
 
-local_install:
+local_install: html
 	for dir in `ls`;					\
 	do							\
 		if [ -d $$dir -a $$dir != "include" ];		\
Index: mailing-lists/mercury-users/Makefile
===================================================================
RCS file: /home/staff/zs/imp/w3/mailing-lists/mercury-users/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	1998/09/04 05:02:22	1.3
+++ Makefile	1998/09/04 06:16:46
@@ -1,4 +1,4 @@
-target: all
+target: html
 
 HTML=	list.html 
 DIRS=

----
 +----------------------------------------------------------------------+
 | Peter Ross      M Sci/Eng Melbourne Uni                              |
 | petdr at cs.mu.oz.au  WWW: www.cs.mu.oz.au/~petdr/ ph: +61 3 9344 9158  |
 +----------------------------------------------------------------------+