Merge branch 'dev-table'

[libucw.git] / build / Maketop

diff --git a/build/Maketop b/build/Maketop
index 6a2103d99b6fab16aa2272ae61a3508e79d943b0..ac3e5cee404984ad6474f3138254150b45a62cde 100644 (file)
--- a/build/Maketop
+++ b/build/Maketop
@@ -16,31 +16,41 @@ LDFLAGS=$(LOPT) $(LEXTRA)
 DIRS=
 PROGS=
 CONFIGS=
-CONFIG_DIR=etc
+CONFIG_SRC_DIR=$(CONFIG_DIR)
 TESTS=
 EXTRA_RUNDIRS=tmp log
 INSTALL_RUNDIRS=bin lib
 API_INCLUDES=
 API_LIBS=
 
+DOCS=
+DOC_INDICES=
+MANPAGES=
+
 # 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 +78,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"`