[fU-cvs] libfunutil Makefile,1.10,1.11

[<sg...@us...>]

Update of /cvsroot/libfunutil/libfunutil
In directory sc8-pr-cvs1:/tmp/cvs-serv1491

Modified Files:
	Makefile 
Log Message:
now uses TOC_OVERRIDE_CLEAN workaround. :/

Index: Makefile
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile	31 Aug 2003 20:21:08 -0000	1.10
+++ Makefile	1 Sep 2003 05:01:04 -0000	1.11
@@ -1,29 +1,27 @@
-# Sample toc-driven top-level Makefile.
+# top-level makefile for the libfunutil project
+
 default: all
+TOC_OVERRIDE_CLEAN = 1# tells cleaner to let us initialize clean/distclean deps
 
-SUBDIRS = lib util tests include 
-SUBDIRS += doc
+SUBDIRS = lib util tests include doc
 SUBDIRS += toc
 
-
 # note: we re-order the clean deps to make sure the shared makefile and config.h
 # don't get deleted until near the end.
 cleanorder = toc doc tests util lib include .
-clean: $(patsubst %,clean-%,$(cleanorder))
-distclean: $(patsubst %,distclean-%,$(cleanorder))
+clean: $(addprefix clean-,$(cleanorder))
+distclean: $(addprefix distclean-,$(cleanorder))
 
 include toc.make
 
-
 # include toc.make to get toc's goodies
 # Unfortunately, toc.make must be included after SUBDIRS (if any) are declared.
-# That's an implementation detail i'll deal with later.
 
 toc.make:
 	@echo "You must run configure once before running make."; exit 1
 
 
-CLEAN_FILES += config.log $(wildcard $(top_srcdir)/.toc*)
+CLEAN_FILES += $(wildcard .toc*)
 
 DISTCLEAN_FILES += *~ toc_shared.make toc_shared.qmake
 
@@ -35,6 +33,6 @@
 DIST_FILES += data/libfunUtil.bpf.in data/Makefile.bt
 endif
 
-all: $(TOC_SHARED_MAKEFILE) subdirs
+all: subdirs