X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=build%2FMaketop;h=743c7b9273d19fb0424163652c938f8576928b45;hb=c8c688e0b06fdacb20b28b66b9b0608dae8ca0dc;hp=99f7f1dc8acfa5f0ec95a537fddee807746c5464;hpb=519baadc3b82940ca2b79ba6e9f794a7f870a528;p=libucw.git

diff --git a/build/Maketop b/build/Maketop
index 99f7f1dc..743c7b92 100644
--- a/build/Maketop
+++ b/build/Maketop
@@ -1,5 +1,5 @@
 # Top part of Makefile for the UCW Libraries
-# (c) 1997--2007 Martin Mares <mj@ucw.cz>
+# (c) 1997--2008 Martin Mares <mj@ucw.cz>
 
 # Set to 1 if you want verbose output
 V=0
@@ -16,6 +16,7 @@ LDFLAGS=$(LOPT) $(LEXTRA)
 DIRS=
 PROGS=
 CONFIGS=
+CONFIG_DIR=etc
 TESTS=
 EXTRA_RUNDIRS=tmp log
 INSTALL_RUNDIRS=bin lib
@@ -38,6 +39,7 @@ SOEXT=bundle
 else
 SOEXT=so
 endif
+SO_RUNDIR=lib
 
 # Whenever "make -s" (silent) is run, turn on verbose mode (paradoxical, but gives the right result)
 ifneq ($(findstring s,$(MAKEFLAGS)),)
@@ -58,12 +60,13 @@ endif
 # Clean needs to be a double-colon rule since we want sub-makefiles to be able
 # to define their own cleanup actions.
 dust::
-	rm -f `find . -path "*~" -or -name "\#*\#" -or -name core`
+	rm -f `find . -path "*~" -or -name "\#*\#"`
 	rm -f allocs.tmp cscope.out TAGS
 
 clean:: dust
-	rm -rf `find obj -mindepth 1 -maxdepth 1 -not \( -name config.mk -o -name autoconf.h \)`
-	rm -rf tests run/{bin,lib,include,.tree-stamp}
+	rm -rf `find obj/ucw -mindepth 1 -maxdepth 1 -not -name autoconf.h`
+	rm -rf `find obj -mindepth 1 -maxdepth 1 -not \( -name config.mk -o -name autoconf.h -o -name ucw \)`
+	rm -rf tests run/{bin,lib,include,.tree-stamp,doc}
 
 distclean:: clean
 	rm -rf obj run
@@ -71,6 +74,9 @@ distclean:: clean
 testclean::
 	rm -f `find obj -name "*.test"`
 
+docclean::
+	rm -f $(DOCS) $(patsubst %.html,%.txt,$(DOCS))
+
 # Extra default rules (appended to by submakefiles)
 extras::