summaryrefslogtreecommitdiff
path: root/kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'kconfig')
-rw-r--r--kconfig/Makefile44
-rw-r--r--kconfig/kconfig.mk20
2 files changed, 32 insertions, 32 deletions
diff --git a/kconfig/Makefile b/kconfig/Makefile
index ee838aa..4a33ac8 100644
--- a/kconfig/Makefile
+++ b/kconfig/Makefile
@@ -2,7 +2,12 @@
# Hmmm! Cheesy build!
# Or: where I can unveil my make-fu... :-]
-all: conf mconf nconf
+__silent = $(if $(V),,@printf ' %-7s %s\n' '$1' '$(if $2,$2,$(strip $<))' && )
+__silent_rm = $(call __silent,RM,$1)rm -f $1
+
+PROGS = conf mconf nconf
+
+all: $(PROGS)
@true # Just be silent, you fscking son of a fscking beach...
# Build flags
@@ -64,8 +69,7 @@ DEPS += $(nconf_DEP)
# Build the dependency for C files
%.dep: %.c
- @echo " DEP '$@'"
- @$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -MM $< |$(sed) -r -e 's|([^:]+.o)( *:+)|$(<:.c=.o) $@\2|;' >$@
+ $(call __silent,DEP,$@)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -MM $< |$(sed) -r -e 's|([^:]+.o)( *:+)|$(<:.c=.o) $@\2|;' >$@
# Generate the grammar parser
zconf.tab.o: zconf.tab.c zconf.hash.c zconf.lex.c
@@ -73,39 +77,39 @@ zconf.tab.dep: zconf.tab.c zconf.hash.c zconf.lex.c
.PRECIOUS: zconf.tab.c
zconf.tab.c: zconf.y
- @echo " BISON '$@'"
- @bison -l -b zconf -p zconf $<
+ $(call __silent,BISON)bison -l -b zconf -p zconf $<
zconf.hash.c: zconf.gperf
- @echo " GPERF '$@'"
- @$(gperf) -C < $< > $@
+ $(call __silent,GPERF)$(gperf) -C < $< > $@
zconf.lex.c: zconf.l
- @echo " LEX '$@'"
- @flex -L -Pzconf -o$@ $<
+ $(call __silent,LEX)flex -L -Pzconf -o$@ $<
# Build C files
%.o: %.c
- @echo " CC '$@'"
- @$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ -c $<
+ $(call __silent,CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ -c $<
# Actual link
mconf: $(COMMON_OBJ) $(LX_OBJ) $(mconf_OBJ)
- @echo " LD '$@'"
- @$(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS)
+ $(call __silent,LD,$@)$(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS)
nconf: $(COMMON_OBJ) $(nconf_OBJ)
- @echo " LD '$@'"
- @$(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS)
+ $(call __silent,LD,$@)$(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS)
conf: $(COMMON_OBJ) $(conf_OBJ)
- @echo " LD '$@'"
- @$(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS)
+ $(call __silent,LD,$@)$(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS)
+
+#-----------------------------------------------------------
+# Installation
+install: $(patsubst %,install-%,$(PROGS)) install-kconfig.mk
+
+install-%: %
+ $(call __silent,INSTALL,$<)install $< $(DESTDIR)/$<
#-----------------------------------------------------------
# Cleaning up the mess...
clean:
- @echo " RM 'kconfig'"
- @rm -f conf mconf nconf $(ALL_OBJS) $(ALL_DEPS)
- @rm -f rm -f zconf.tab.c zconf.hash.c zconf.lex.c lex.backup
+ $(call __silent,RM,objs)rm -f $(ALL_OBJS) $(ALL_DEPS)
+ $(call __silent_rm,$(PROGS))
+ $(call __silent_rm,zconf.tab.c zconf.hash.c zconf.lex.c lex.backup)
diff --git a/kconfig/kconfig.mk b/kconfig/kconfig.mk
index 3d330b4..c82e502 100644
--- a/kconfig/kconfig.mk
+++ b/kconfig/kconfig.mk
@@ -5,31 +5,27 @@
#-----------------------------------------------------------
# The configurators rules
-configurators = menuconfig nconfig oldconfig savedefconfig defconfig
-PHONY += $(configurators)
-
-$(configurators): config_files
-
-export CT_IS_A_BACKEND:=$(CT_IS_A_BACKEND)
-export CT_BACKEND_ARCH:=$(CT_BACKEND_ARCH)
-export CT_BACKEND_KERNEL:=$(CT_BACKEND_KERNEL)
-export CT_BACKEND_LIBC:=$(CT_BACKEND_LIBC)
+# Top file of crosstool-NG configuration
+export KCONFIG_TOP = $(CT_LIB_DIR)/config/config.in
# We need CONF for savedefconfig in scripts/saveSample.sh
export CONF := $(CT_LIB_DIR)/kconfig/conf
MCONF := $(CT_LIB_DIR)/kconfig/mconf
NCONF := $(CT_LIB_DIR)/kconfig/nconf
+# Used by conf/mconf/nconf to find the .in files
+export srctree=$(CT_LIB_DIR)
+
menuconfig:
- @$(CT_ECHO) " CONF $(KCONFIG_TOP)"
+ @$(CT_ECHO) " CONF $@"
$(SILENT)$(MCONF) $(KCONFIG_TOP)
nconfig:
- @$(CT_ECHO) " CONF $(KCONFIG_TOP)"
+ @$(CT_ECHO) " CONF $@"
$(SILENT)$(NCONF) $(KCONFIG_TOP)
oldconfig: .config
- @$(CT_ECHO) " CONF $(KCONFIG_TOP)"
+ @$(CT_ECHO) " CONF $@"
$(SILENT)$(CONF) --silent$@ $(KCONFIG_TOP)
savedefconfig: .config