X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=build%2FMaketop;h=5027cfce74d7a57ebc70986e3af4fa8d42279683;hb=0f2fe2a049521c4b43f446794f23ebb989ddd606;hp=33ee0ce9b71cdd2c1500d19c345ccfc1c930eaa5;hpb=e6f42d16d3278e709f23825944598769539368e5;p=libucw.git

diff --git a/build/Maketop b/build/Maketop
index 33ee0ce9..5027cfce 100644
--- a/build/Maketop
+++ b/build/Maketop
@@ -1,18 +1,22 @@
 # 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
 
+# Set to 'y' (or 'n') if you want to auto-confirm (auto-reject) all questions in build/installer
+CONFIRM=
+
 # Disable all built-in rules and variables. Speeds up make and simplifies debugging.
 MAKEFLAGS+=-rR
 
-CFLAGS=$(CLANG) $(COPT) $(CDEBUG) $(CWARNS) -I. -I$(o) -I$(s)
-LDFLAGS=$(LOPT)
+CFLAGS=$(CLANG) $(COPT) $(CDEBUG) $(CWARNS) $(CEXTRA) -I. -I$(o) -I$(s)
+LDFLAGS=$(LOPT) $(LEXTRA)
 
 DIRS=
 PROGS=
 CONFIGS=
+CONFIG_DIR=etc
 TESTS=
 EXTRA_RUNDIRS=tmp log
 INSTALL_RUNDIRS=bin lib
@@ -35,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)),)
@@ -55,11 +60,12 @@ 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 `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}
 
 distclean:: clean
@@ -68,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::
 
@@ -77,3 +86,4 @@ space:=$(empty) $(empty)
 backref=$(subst $(space),/,$(patsubst %,..,$(subst /,$(space),$(1))))
 tack-on=$(if $(patsubst /%,,$(2)),$(1)/$(2),$(2))
 symlink=ln -sf $(call tack-on,$(call backref,$(2)),$(1)) $(2)/
+symlink-alias=ln -sf $(call tack-on,$(call backref,$(2)),$(1)) $(2)/$(3)