X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=build%2FMaketop;h=b45187ab511f02eee54a7d149f72bbb483a262f9;hb=93af84243ca8181a97bcc43142df30114b32f315;hp=6a2103d99b6fab16aa2272ae61a3508e79d943b0;hpb=5885a915fd709d3d1b6559a81145b9fe3aade4d0;p=libucw.git

diff --git a/build/Maketop b/build/Maketop
index 6a2103d9..b45187ab 100644
--- a/build/Maketop
+++ b/build/Maketop
@@ -16,7 +16,7 @@ LDFLAGS=$(LOPT) $(LEXTRA)
 DIRS=
 PROGS=
 CONFIGS=
-CONFIG_DIR=etc
+CONFIG_SRC_DIR=$(CONFIG_DIR)
 TESTS=
 EXTRA_RUNDIRS=tmp log
 INSTALL_RUNDIRS=bin lib
@@ -26,21 +26,27 @@ API_LIBS=
 # Various files whose type does not fit into PROGS
 DATAFILES=
 
-ifdef CONFIG_SHARED
-LS=so
-OS=oo
-else
-LS=a
-OS=o
-endif
-
 ifdef CONFIG_DARWIN
+DYNAMIC_LIBRARIES=dylib
 SOEXT=bundle
 HOST_PREFIX=/sw
 else
+DYNAMIC_LIBRARIES=so
 SOEXT=so
 HOST_PREFIX=
 endif
+
+ifdef CONFIG_SHARED
+LS=$(DYNAMIC_LIBRARIES)
+OS=oo
+PKG_CONFIG_OPTS=
+else
+LS=a
+OS=o
+PKG_CONFIG_OPTS=--static
+endif
+LV=$(UCW_ABI_SUFFIX)
+
 SO_RUNDIR=lib
 
 # Whenever "make -s" (silent) is run, turn on verbose mode (paradoxical, but gives the right result)
@@ -68,10 +74,10 @@ dust::
 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"`