diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-02-23 21:23:35 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-02-23 21:23:35 +0000 |
| commit | cd7f4c568af5a1bdcd22c1ad86eab951a25ea300 (patch) | |
| tree | 80d1a1edd911ccc88ddb8f9c7651fea2c5d8ecf9 | |
| parent | bd55ee29cb155bf9b4277b497b51037c3569076f (diff) | |
| download | ptxdist-cd7f4c568af5a1bdcd22c1ad86eab951a25ea300.tar.gz ptxdist-cd7f4c568af5a1bdcd22c1ad86eab951a25ea300.tar.xz | |
[ncurses] cleanup AUTOCONF variable handling
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9823 33e552b5-05e3-0310-8538-816dae2090ed
| -rw-r--r-- | rules/host-ncurses.make | 4 | ||||
| -rw-r--r-- | rules/ncurses.make | 27 |
2 files changed, 14 insertions, 17 deletions
diff --git a/rules/host-ncurses.make b/rules/host-ncurses.make index 4fbd8ba33..cf6e2c303 100644 --- a/rules/host-ncurses.make +++ b/rules/host-ncurses.make @@ -1,7 +1,7 @@ # -*-makefile-*- # $Id$ # -# Copyright (C) 2008 by +# Copyright (C) 2008 by mol@pengutronix.de # # See CREDITS for details about who has contributed to this project. # @@ -55,7 +55,7 @@ $(STATEDIR)/host-ncurses.prepare: @$(call clean, $(HOST_NCURSES_DIR)/config.cache) cd $(HOST_NCURSES_DIR) && \ $(HOST_NCURSES_PATH) $(HOST_NCURSES_ENV) \ - ./configure $(HOST_NCURSES_AUTOCONF) $(SHARED_NCURSES_AUTOCONF) + ./configure $(HOST_NCURSES_AUTOCONF) $(NCURSES_AUTOCONF) @$(call touch) # ---------------------------------------------------------------------------- diff --git a/rules/ncurses.make b/rules/ncurses.make index 9653366be..4a009215e 100644 --- a/rules/ncurses.make +++ b/rules/ncurses.make @@ -1,7 +1,7 @@ # -*-makefile-*- # $Id$ # -# Copyright (C) 2002-2006 by Pengutronix e.K., Hildesheim, Germany +# Copyright (C) 2002-2009 by Pengutronix e.K., Hildesheim, Germany # See CREDITS for details about who has contributed to this project. # # For further information about the PTXdist project and license conditions @@ -40,32 +40,29 @@ NCURSES_PATH := PATH=$(CROSS_PATH) NCURSES_ENV := $(CROSS_ENV) NCURSES_AUTOCONF := \ - $(CROSS_AUTOCONF_USR) - -# also used by host-ncurses -SHARED_NCURSES_AUTOCONF := \ - --libdir=/lib \ - --with-normal \ - --with-shared \ + $(CROSS_AUTOCONF_USR) \ + --disable-echo \ --disable-nls \ - --without-ada \ --enable-const \ --enable-overwrite \ - --without-gpm \ + --libdir=/lib \ --with-debug \ - --disable-echo + --with-normal \ + --with-shared \ + --without-ada \ + --without-gpm # enable wide char support on demand only ifdef PTXCONF_NCURSES_WIDE_CHAR -SHARED_NCURSES_AUTOCONF += --enable-widec +NCURSES_AUTOCONF += --enable-widec else -SHARED_NCURSES_AUTOCONF += --disable-widec +NCURSES_AUTOCONF += --disable-widec endif ifdef PTXCONF_NCURSES_BIG_CORE -SHARED_NCURSES_AUTOCONF += --enable-big-core +NCURSES_AUTOCONF += --enable-big-core else -SHARED_NCURSES_AUTOCONF += --disable-big-core +NCURSES_AUTOCONF += --disable-big-core endif # ---------------------------------------------------------------------------- |