X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=build%2FMaketop;h=b45187ab511f02eee54a7d149f72bbb483a262f9;hb=93af84243ca8181a97bcc43142df30114b32f315;hp=4058e2f25314060d0a2365bd5efa268f23888485;hpb=ee02a2fb2e3f92cffb4726f360f12fd662f42b78;p=libucw.git

diff --git a/build/Maketop b/build/Maketop
index 4058e2f2..b45187ab 100644
--- a/build/Maketop
+++ b/build/Maketop
@@ -16,7 +16,7 @@ LDFLAGS=$(LOPT) $(LEXTRA)
 DIRS=
 PROGS=
 CONFIGS=
-CONFIG_DIR=cf
+CONFIG_SRC_DIR=$(CONFIG_DIR)
 TESTS=
 EXTRA_RUNDIRS=tmp log
 INSTALL_RUNDIRS=bin lib
@@ -26,19 +26,28 @@ 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
+PKG_CONFIG_OPTS=
 else
 LS=a
 OS=o
+PKG_CONFIG_OPTS=--static
 endif
+LV=$(UCW_ABI_SUFFIX)
 
-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)),)
@@ -59,16 +68,16 @@ 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/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}
+	rm -rf tests run/{bin,lib,include,.tree-stamp,doc}
 
 distclean:: clean
-	rm -rf obj run
+	rm -rf obj run debian-tmp
 
 testclean::
 	rm -f `find obj -name "*.test"`