summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Glaser <tg@mirbsd.org>2009-12-20 16:10:49 +0059
committerWaldemar Brodkorb <wbx@openadk.org>2009-12-20 17:37:03 +0100
commit95c40793aaa5faa69012ccb8c5c54cee13510d01 (patch)
treee148c134648d3999c360f66df33f3e765a5512a7
parent61a7366c9306f17c45b7832de1c2838ab017ac38 (diff)
another round of 'make distclean' fixing
Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
-rw-r--r--config/Makefile4
-rw-r--r--mk/build.mk5
2 files changed, 7 insertions, 2 deletions
diff --git a/config/Makefile b/config/Makefile
index f2e20cbf8..e42117824 100644
--- a/config/Makefile
+++ b/config/Makefile
@@ -1,7 +1,9 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
+ifneq ($(filter-out clean,${MAKECMDGOALS}),)
include ${TOPDIR}/rules.mk
+endif
CP=cp -fpR
HOSTCFLAGS+=-DKBUILD_NO_NLS
@@ -124,5 +126,5 @@ ncurses:
fi
clean:
- rm -f *.o *~ core $(TARGETS) $(MCONF_OBJS) $(CONF_OBJS) \
+ rm -f *.o *~ core $(TARGETS) $(MCONF_OBJS) $(CONF_OBJS) zconf.hash.c \
conf mconf zconf.tab.c zconf.tab.h lex.zconf.c lkc_defs.h
diff --git a/mk/build.mk b/mk/build.mk
index 3adea0d8c..9a399cc0c 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -40,6 +40,7 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \
noconfig_targets:= menuconfig \
_config \
_mconfig \
+ distclean \
tags
MAKECLEAN_SYMBOLS= ADK_TARGET_LIB_UCLIBC \
@@ -211,9 +212,11 @@ distclean:
rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk
-else # ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
+else # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
+ifneq ($(filter-out distclean,${MAKECMDGOALS}),)
include $(TOPDIR)/prereq.mk
+endif
all: menuconfig
@echo "Start the build with \"make\" or with \"make v\" to be verbose"