X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=build%2FMaketop;h=4fa79c588281100cc473cc1318d4d5b76225eebd;hb=30058c43d5963b139c91800a51705917020722ae;hp=cf93e1bfa277322b3e6b017e74891e498d401d86;hpb=7c01d8c6eb3c3756b3dbec4b5a8ff2c988f13145;p=eval.git

diff --git a/build/Maketop b/build/Maketop
index cf93e1b..4fa79c5 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_SRC_DIR=$(CONFIG_DIR)
 TESTS=
 EXTRA_RUNDIRS=tmp log
 INSTALL_RUNDIRS=bin lib
@@ -25,19 +26,25 @@ API_LIBS=
 # Various files whose type does not fit into PROGS
 DATAFILES=
 
+ifdef CONFIG_DARWIN
+DYNAMIC_LIBRARIES=dylib
+SOEXT=bundle
+HOST_PREFIX=/sw
+else
+DYNAMIC_LIBRARIES=so
+SOEXT=so
+HOST_PREFIX=
+endif
+
 ifdef CONFIG_SHARED
-LS=so
+LS=$(DYNAMIC_LIBRARIES)
 OS=oo
 else
 LS=a
 OS=o
 endif
 
-ifdef CONFIG_DARWIN
-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 +65,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 +79,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::
 
@@ -80,3 +91,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)