summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-09-16 08:19:07 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-09-16 08:19:07 +0000
commitc14e3c99f7cd9e2721edf69e103d1649a88b6b88 (patch)
treedcdf653001e1b10fc6ca39226c4c194944a68c5a /Makefile.in
parente9a22a46d74aa21284502720dfc5bbd3540d3457 (diff)
- do not attempt to rm twice
- clean targets are supposed to clean independently of any .config
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in28
1 files changed, 16 insertions, 12 deletions
diff --git a/Makefile.in b/Makefile.in
index e6fae61e0..d2590882f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,8 +8,10 @@
#--------------------------------------------------------------
# You shouldn't need to mess with anything beyond this point...
#--------------------------------------------------------------
+clean_targets := clean realclean distclean \
+ objclean-y headers_clean-y utils_clean
noconfig_targets := menuconfig config oldconfig silentoldconfig randconfig \
- defconfig allyesconfig allnoconfig clean distclean \
+ defconfig allyesconfig allnoconfig \
release dist tags help
include $(top_builddir)Rules.mak
@@ -24,6 +26,16 @@ all: pregen libs
# In this section, we need .config
-include .config.cmd
+else # ifeq ($(HAVE_DOT_CONFIG),y)
+
+all: menuconfig
+
+headers:
+ @echo "Need to make a config file first, run: make menuconfig"
+ @false
+
+endif # ifeq ($(HAVE_DOT_CONFIG),y)
+
include $(top_srcdir)ldso/Makefile.in
include $(top_srcdir)libcrypt/Makefile.in
include $(top_srcdir)libintl/Makefile.in
@@ -38,6 +50,7 @@ include $(top_srcdir)extra/locale/Makefile.in
# last included to catch all the objects added by others (locales/threads)
include $(top_srcdir)libc/Makefile.in
+ifeq ($(HAVE_DOT_CONFIG),y)
# If the .config changes then we have to make sure that our includes are
# updated properly. This would normally work by saying that the headers
# have uClibc_config.h as prerequisite but since we _symlink_ the headers
@@ -410,14 +423,6 @@ utils:
install_utils: utils
$(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils utils_install
-else # ifeq ($(HAVE_DOT_CONFIG),y)
-
-all: menuconfig
-
-headers:
- @echo "Need to make a config file first, run: make menuconfig"
- @false
-
endif # ifeq ($(HAVE_DOT_CONFIG),y)
include/bits:
@@ -466,9 +471,8 @@ clean:
libm/*.a libnsl/*.a libpthread/*.a libresolv/*.a librt/*.a \
libutil/*.a lib/*.a \
include/fpu_control.h include/dl-osinfo.h include/hp-timing.h
- $(MAKE) objclean-y headers_clean-y
- $(MAKE) -s -C test clean
- $(MAKE) -C utils utils_clean
+ +$(MAKE) -s -C test clean
+ +$(MAKE) -C utils utils_clean
@set -e; \
for i in `(cd libc/sysdeps/linux/common/sys; ls *.h)` ; do \
$(RM) include/sys/$$i; \