Opt: Constify

[libucw.git] / build / Maketop

diff --git a/build/Maketop b/build/Maketop
index cdaae4f6b7b9e22cd76318dc24cabc50a98924ac..b45187ab511f02eee54a7d149f72bbb483a262f9 100644 (file)
--- a/build/Maketop
+++ b/build/Maketop
@@ -16,7 +16,7 @@ LDFLAGS=$(LOPT) $(LEXTRA)
 DIRS=
 PROGS=
 CONFIGS=
 DIRS=
 PROGS=
 CONFIGS=

-CONFIG_DIR=etc
+CONFIG_SRC_DIR=$(CONFIG_DIR)

 TESTS=
 EXTRA_RUNDIRS=tmp log
 INSTALL_RUNDIRS=bin lib
 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=
 
 # 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
 ifdef CONFIG_SHARED

-LS=so
+LS=$(DYNAMIC_LIBRARIES)

 OS=oo
 OS=oo

+PKG_CONFIG_OPTS=

 else
 LS=a
 OS=o
 else
 LS=a
 OS=o

+PKG_CONFIG_OPTS=--static

 endif
 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)),)
 
 # Whenever "make -s" (silent) is run, turn on verbose mode (paradoxical, but gives the right result)
 ifneq ($(findstring s,$(MAKEFLAGS)),)


@@ -65,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 \)`
 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
 
 distclean:: clean

-       rm -rf obj run
+       rm -rf obj run debian-tmp

 
 testclean::
        rm -f `find obj -name "*.test"`
 
 testclean::
        rm -f `find obj -name "*.test"`