diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2008-10-17 12:47:53 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2008-10-17 12:47:53 (GMT) |
| commit | f31bcd0026c2a3d5a38d3f16418876efcf7cd031 (patch) | |
| tree | cd294553e433dde5ecceee767fcbf002f531aef1 /kconfig/kconfig.mk | |
| parent | c54f4302cdd3f4b5e5fde5ab63001f263e0664a3 (diff) | |
Update the kconfig stuff to match the one in the linux-2.6.27 version.
/trunk/kconfig/zconf.hash.c | 225 110 115 0 +++----
/trunk/kconfig/lkc_proto.h | 4 3 1 0 +
/trunk/kconfig/mconf.c | 217 110 107 0 +++---
/trunk/kconfig/menu.c | 86 60 26 0 ++-
/trunk/kconfig/symbol.c | 212 156 56 0 ++++--
/trunk/kconfig/kconfig.mk | 24 9 15 0 -
/trunk/kconfig/lex.zconf.c | 97 80 17 0 ++-
/trunk/kconfig/util.c | 38 30 8 0 +
/trunk/kconfig/lkc.h | 22 18 4 0 +
/trunk/kconfig/expr.c | 32 19 13 0 +
/trunk/kconfig/confdata.c | 254 172 82 0 +++++---
/trunk/kconfig/lxdialog/dialog.h | 12 9 3 0 +
/trunk/kconfig/lxdialog/inputbox.c | 6 3 3 0
/trunk/kconfig/lxdialog/checklist.c | 4 2 2 0
/trunk/kconfig/lxdialog/menubox.c | 6 3 3 0
/trunk/kconfig/lxdialog/textbox.c | 2 1 1 0
/trunk/kconfig/lxdialog/util.c | 47 30 17 0 +
/trunk/kconfig/lxdialog/yesno.c | 4 2 2 0
/trunk/kconfig/expr.h | 20 10 10 0
/trunk/kconfig/zconf.tab.c | 1441 793 648 0 ++++++++++++++++++++++++-------------------
/trunk/kconfig/conf.c | 276 124 152 0 ++++----
/trunk/kconfig/check-gettext.sh | 14 14 0 0 +
/trunk/ct-ng.in | 2 1 1 0
23 files changed, 1759 insertions(+), 1286 deletions(-)
Diffstat (limited to 'kconfig/kconfig.mk')
| -rw-r--r-- | kconfig/kconfig.mk | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/kconfig/kconfig.mk b/kconfig/kconfig.mk index 91ca484..ae340a8 100644 --- a/kconfig/kconfig.mk +++ b/kconfig/kconfig.mk @@ -12,15 +12,6 @@ KCONFIG_TOP = config/config.in obj = kconfig PHONY += clean help oldconfig menuconfig defoldconfig -# Darwin (MacOS-X) does not have proper libintl support -ifeq ($(shell uname -s),Darwin) -KBUILD_NO_NLS:=1 -endif - -ifneq ($(KBUILD_NO_NLS),) -CFLAGS += -DKBUILD_NO_NLS -endif - #----------------------------------------------------------- # List all config files, source and generated @@ -212,9 +203,12 @@ vpath %.h $(CT_LIB_DIR) # What is the compiler? HOST_CC ?= gcc -funsigned-char +# Compiler flags to use gettext +EXTRA_CFLAGS += $(shell $(SHELL) $(CT_LIB_DIR)/kconfig/check-gettext.sh $(HOST_CC) $(CFLAGS)) + # Compiler and linker flags to use ncurses -CFLAGS += $(shell $(CT_LIB_DIR)/kconfig/lxdialog/check-lxdialog.sh -ccflags) -LDFLAGS += $(shell $(CT_LIB_DIR)/kconfig/lxdialog/check-lxdialog.sh -ldflags $(HOST_CC)) +EXTRA_CFLAGS += $(shell $(SHELL) $(CT_LIB_DIR)/kconfig/lxdialog/check-lxdialog.sh -ccflags) +EXTRA_LDFLAGS += $(shell $(SHELL) $(CT_LIB_DIR)/kconfig/lxdialog/check-lxdialog.sh -ldflags $(HOST_CC)) # Common source files, and lxdialog source files SRC = kconfig/zconf.tab.c @@ -241,7 +235,7 @@ DEPS = $(patsubst %.c,%.d,$(sort $(conf_SRC) $(mconf_SRC))) mkdir -p $(obj)/lxdialog; \ fi @$(ECHO) " DEP $@" - $(SILENT)$(HOST_CC) $(CFLAGS) -MM $< |sed -r -e 's|([^:]+.o)( *:+)|$(<:.c=.o) $@\2|;' >$@ + $(SILENT)$(HOST_CC) $(CFLAGS) $(EXTRA_CFLAGS) -MM $< |sed -r -e 's|([^:]+.o)( *:+)|$(<:.c=.o) $@\2|;' >$@ -include $(DEPS) # Each .o must depend on the corresponding .c (obvious, isn't it?), @@ -259,15 +253,15 @@ DEPS = $(patsubst %.c,%.d,$(sort $(conf_SRC) $(mconf_SRC))) mkdir -p $(obj)/lxdialog; \ fi @$(ECHO) " CC $@" - $(SILENT)$(HOST_CC) $(CFLAGS) -o $@ -c $< + $(SILENT)$(HOST_CC) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ -c $< $(obj)/mconf: $(mconf_OBJ) @$(ECHO) ' LD $@' - $(SILENT)$(HOST_CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ + $(SILENT)$(HOST_CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -o $@ $^ $(obj)/conf: $(conf_OBJ) @$(ECHO) ' LD $@' - $(SILENT)$(HOST_CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ + $(SILENT)$(HOST_CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -o $@ $^ #----------------------------------------------------------- # Cleaning up the mess... |