From 352534d548b77595ba3b3e3ea040486fbff11643 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 12 Mar 2010 16:19:39 +0100 Subject: reduce number of mkdir calls Signed-off-by: Bernhard Reutner-Fischer --- Makefile.in | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 9a945be31..bd5f16c9a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -161,8 +161,7 @@ headers: $(top_builddir)include/bits/uClibc_config.h subdirs: $(addprefix $(top_builddir),$(subdirs)) pregen: $(top_builddir)include/bits/sysnum.h headers subdirs -$(top_builddir)include/bits/sysnum.h: $(top_srcdir)extra/scripts/gen_bits_syscall_h.sh - $(Q)$(INSTALL) -d $(@D) +$(top_builddir)include/bits/sysnum.h: $(top_srcdir)extra/scripts/gen_bits_syscall_h.sh | $(top_builddir)include/bits @$(disp_gen) $(Q)set -e; \ tmp=`mktemp $(top_builddir)include/bits/sysnum.h.XXXXXX 2>/dev/null || true`; \ @@ -286,8 +285,12 @@ HEADERS_RM-$(UCLIBC_SUSV4_LEGACY) += utime.h # BREAKAGE: include/signal.h uses it, this rm broke bbox compile: ### ucontext.h -install_headers: headers $(top_builddir)extra/scripts/unifdef - $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)include +ifneq ($(findstring install,$(MAKECMDGOALS)),) +$(PREFIX)$(RUNTIME_PREFIX)lib $(addprefix $(PREFIX)$(DEVEL_PREFIX),include lib): + $(do_mkdir) +endif + +install_headers: headers $(top_builddir)extra/scripts/unifdef | $(PREFIX)$(DEVEL_PREFIX)include top_builddir=$(top_builddir) \ $(top_srcdir)extra/scripts/install_headers.sh include $(PREFIX)$(DEVEL_PREFIX)include cd $(PREFIX)$(DEVEL_PREFIX)include && $(RM) -r $(HEADERS_RM-) @@ -298,8 +301,7 @@ else endif # Installs development library links. -install_dev: install_headers install_runtime - $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)lib +install_dev: install_headers install_runtime | $(PREFIX)$(DEVEL_PREFIX)lib -$(INSTALL) -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)lib/ ifeq ($(HAVE_SHARED),y) for i in `find lib/ -type l -name 'lib[a-zA-Z]*.so' | \ @@ -358,9 +360,8 @@ ifeq ($(UCLIBC_FORMAT_SHARED_FLAT),y) endif # Installs run-time libraries -install_runtime: all +install_runtime: all | $(PREFIX)$(RUNTIME_PREFIX)lib ifeq ($(HAVE_SHARED),y) - $(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)lib $(INSTALL) -m 755 lib/lib*-$(VERSION).so \ $(PREFIX)$(RUNTIME_PREFIX)lib (cd lib && $(TAR) -cf - *.so.*) | $(TAR) -xf - -C $(PREFIX)$(RUNTIME_PREFIX)lib -- cgit v1.2.3 From 0ddde69e28793e245460d6de17a4e2c922785f07 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 12 Mar 2010 16:27:42 +0100 Subject: install: fix O= PREFIX= install Signed-off-by: Bernhard Reutner-Fischer --- Makefile.in | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index bd5f16c9a..a4424f758 100644 --- a/Makefile.in +++ b/Makefile.in @@ -302,9 +302,9 @@ endif # Installs development library links. install_dev: install_headers install_runtime | $(PREFIX)$(DEVEL_PREFIX)lib - -$(INSTALL) -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)lib/ + -$(INSTALL) -m 644 $(top_builddir)lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)lib/ ifeq ($(HAVE_SHARED),y) - for i in `find lib/ -type l -name 'lib[a-zA-Z]*.so' | \ + for i in `find $(top_builddir)lib/ -type l -name 'lib[a-zA-Z]*.so' | \ $(SED) -e 's/lib\///'` ; do \ $(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)$$i.$(MAJOR_VERSION) \ $(PREFIX)$(DEVEL_PREFIX)lib/$$i; \ @@ -318,7 +318,7 @@ ifeq ($(HARDWIRED_ABSPATH),y) $(top_builddir)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \ fi else - -$(INSTALL) -m 755 lib/libc.so $(PREFIX)$(DEVEL_PREFIX)lib/ + -$(INSTALL) -m 755 $(top_builddir)lib/libc.so $(PREFIX)$(DEVEL_PREFIX)lib/ endif ifeq ($(UCLIBC_HAS_THREADS),y) ifneq ($(LINUXTHREADS_OLD),y) @@ -330,7 +330,7 @@ ifeq ($(HARDWIRED_ABSPATH),y) >> $(PREFIX)$(DEVEL_PREFIX)lib/libpthread.so; \ fi else - -$(INSTALL) -m 755 lib/libpthread.so $(PREFIX)$(DEVEL_PREFIX)lib/ + -$(INSTALL) -m 755 $(top_builddir)lib/libpthread.so $(PREFIX)$(DEVEL_PREFIX)lib/ endif endif endif @@ -341,8 +341,8 @@ endif ifeq ($(DOPIC),y) # # If we build shared libraries then the static libs are PIC... # # Make _pic.a symlinks to make mklibs.py and similar tools happy. - if [ -d lib ] ; then \ - for i in `find lib/ -type f -name 'lib*.a' | $(SED) -e 's/lib\///'` ; do \ + if [ -d $(top_builddir)lib ] ; then \ + for i in `find $(top_builddir)lib/ -type f -name 'lib*.a' | $(SED) -e 's/lib\///'` ; do \ $(LN) -sf $$i $(PREFIX)$(DEVEL_PREFIX)lib/`echo $$i \ | $(SED) -e 's/\.a$$/_pic.a/'`; \ done ; \ @@ -350,7 +350,7 @@ ifeq ($(DOPIC),y) endif endif ifeq ($(UCLIBC_FORMAT_SHARED_FLAT),y) - for file in lib/lib*.gdb; do \ + for file in $(top_builddir)lib/lib*.gdb; do \ if test -f $$file; then \ $(INSTALL) -m 755 $$file $(PREFIX)$(DEVEL_PREFIX)lib; \ $(INSTALL) -m 755 `echo $$file | $(SED) 's/\.gdb$$//'` \ @@ -362,13 +362,13 @@ endif # Installs run-time libraries install_runtime: all | $(PREFIX)$(RUNTIME_PREFIX)lib ifeq ($(HAVE_SHARED),y) - $(INSTALL) -m 755 lib/lib*-$(VERSION).so \ + $(INSTALL) -m 755 $(top_builddir)lib/lib*-$(VERSION).so \ $(PREFIX)$(RUNTIME_PREFIX)lib - (cd lib && $(TAR) -cf - *.so.*) | $(TAR) -xf - -C $(PREFIX)$(RUNTIME_PREFIX)lib - @if [ -x lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so ] ; then \ + (cd $(top_builddir)lib && $(TAR) -cf - *.so.*) | $(TAR) -xf - -C $(PREFIX)$(RUNTIME_PREFIX)lib + @if [ -x $(top_builddir)lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so ] ; then \ set -e; \ $(SHELL_SET_X); \ - $(INSTALL) -m 755 lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so \ + $(INSTALL) -m 755 $(top_builddir)lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so \ $(PREFIX)$(RUNTIME_PREFIX)lib; \ fi endif -- cgit v1.2.3 From 58a0daa6a5f4ef60234ad8200017d6d19be287c7 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 12 Mar 2010 17:06:35 +0100 Subject: add MULTILIB_DIR: Path component for libdirs defaults to "lib". Other prominent values include "lib32" or "lib64" Signed-off-by: Bernhard Reutner-Fischer --- Makefile.in | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index a4424f758..53828204d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -191,7 +191,7 @@ $(LOCAL_INSTALL_PATH): install: install_runtime install_dev -RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell $(top_srcdir)extra/scripts/relative_path.sh $(DEVEL_PREFIX)lib $(RUNTIME_PREFIX)lib) +RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell $(top_srcdir)extra/scripts/relative_path.sh $(DEVEL_PREFIX)$(MULTILIB_DIR) $(RUNTIME_PREFIX)$(MULTILIB_DIR)) $(top_builddir)extra/scripts/unifdef: $(top_srcdir)extra/scripts/unifdef.c|$(@D) $(hcompile.u) @@ -286,7 +286,7 @@ HEADERS_RM-$(UCLIBC_SUSV4_LEGACY) += utime.h ### ucontext.h ifneq ($(findstring install,$(MAKECMDGOALS)),) -$(PREFIX)$(RUNTIME_PREFIX)lib $(addprefix $(PREFIX)$(DEVEL_PREFIX),include lib): +$(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR) $(addprefix $(PREFIX)$(DEVEL_PREFIX),include lib): $(do_mkdir) endif @@ -301,49 +301,49 @@ else endif # Installs development library links. -install_dev: install_headers install_runtime | $(PREFIX)$(DEVEL_PREFIX)lib - -$(INSTALL) -m 644 $(top_builddir)lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)lib/ +install_dev: install_headers install_runtime | $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR) + -$(INSTALL) -m 644 $(top_builddir)lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/ ifeq ($(HAVE_SHARED),y) for i in `find $(top_builddir)lib/ -type l -name 'lib[a-zA-Z]*.so' | \ $(SED) -e 's/lib\///'` ; do \ $(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)$$i.$(MAJOR_VERSION) \ - $(PREFIX)$(DEVEL_PREFIX)lib/$$i; \ + $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/$$i; \ done ifeq ($(HARDWIRED_ABSPATH),y) - if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) ] ; then \ - $(RM) $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \ - $(SED) -e 's:$(NONSHARED_LIBNAME):$(DEVEL_PREFIX)lib/$(NONSHARED_LIBNAME):' \ - -e 's:$(SHARED_MAJORNAME):$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME):' \ - -e 's:$(UCLIBC_LDSO):$(RUNTIME_PREFIX)lib/$(UCLIBC_LDSO):' \ - $(top_builddir)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \ + if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(SHARED_MAJORNAME) ] ; then \ + $(RM) $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so; \ + $(SED) -e 's:$(NONSHARED_LIBNAME):$(DEVEL_PREFIX)$(MULTILIB_DIR)/$(NONSHARED_LIBNAME):' \ + -e 's:$(SHARED_MAJORNAME):$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(SHARED_MAJORNAME):' \ + -e 's:$(UCLIBC_LDSO):$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(UCLIBC_LDSO):' \ + $(top_builddir)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so; \ fi else - -$(INSTALL) -m 755 $(top_builddir)lib/libc.so $(PREFIX)$(DEVEL_PREFIX)lib/ + -$(INSTALL) -m 755 $(top_builddir)lib/libc.so $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/ endif ifeq ($(UCLIBC_HAS_THREADS),y) ifneq ($(LINUXTHREADS_OLD),y) ifeq ($(HARDWIRED_ABSPATH),y) - if [ -f $(top_builddir)lib/libpthread.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/libpthread.so.$(MAJOR_VERSION) ] ; then \ - $(RM) $(PREFIX)$(DEVEL_PREFIX)lib/libpthread.so; \ - cp $(top_srcdir)extra/scripts/format.lds $(PREFIX)$(DEVEL_PREFIX)lib/libpthread.so; \ - echo "GROUP ( $(RUNTIME_PREFIX)lib/libpthread.so.$(MAJOR_VERSION) $(DEVEL_PREFIX)lib/libpthread_nonshared.a )" \ - >> $(PREFIX)$(DEVEL_PREFIX)lib/libpthread.so; \ + if [ -f $(top_builddir)lib/libpthread.so -a -f $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)/libpthread.so.$(MAJOR_VERSION) ] ; then \ + $(RM) $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libpthread.so; \ + cp $(top_srcdir)extra/scripts/format.lds $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libpthread.so; \ + echo "GROUP ( $(RUNTIME_PREFIX)$(MULTILIB_DIR)/libpthread.so.$(MAJOR_VERSION) $(DEVEL_PREFIX)$(MULTILIB_DIR)/libpthread_nonshared.a )" \ + >> $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libpthread.so; \ fi else - -$(INSTALL) -m 755 $(top_builddir)lib/libpthread.so $(PREFIX)$(DEVEL_PREFIX)lib/ + -$(INSTALL) -m 755 $(top_builddir)lib/libpthread.so $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/ endif endif endif ifeq ($(PTHREADS_DEBUG_SUPPORT),y) $(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)libthread_db.so.1 \ - $(PREFIX)$(DEVEL_PREFIX)lib/libthread_db.so + $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libthread_db.so endif ifeq ($(DOPIC),y) # # If we build shared libraries then the static libs are PIC... # # Make _pic.a symlinks to make mklibs.py and similar tools happy. if [ -d $(top_builddir)lib ] ; then \ for i in `find $(top_builddir)lib/ -type f -name 'lib*.a' | $(SED) -e 's/lib\///'` ; do \ - $(LN) -sf $$i $(PREFIX)$(DEVEL_PREFIX)lib/`echo $$i \ + $(LN) -sf $$i $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/`echo $$i \ | $(SED) -e 's/\.a$$/_pic.a/'`; \ done ; \ fi @@ -352,24 +352,24 @@ endif ifeq ($(UCLIBC_FORMAT_SHARED_FLAT),y) for file in $(top_builddir)lib/lib*.gdb; do \ if test -f $$file; then \ - $(INSTALL) -m 755 $$file $(PREFIX)$(DEVEL_PREFIX)lib; \ + $(INSTALL) -m 755 $$file $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR); \ $(INSTALL) -m 755 `echo $$file | $(SED) 's/\.gdb$$//'` \ - $(PREFIX)$(DEVEL_PREFIX)lib; \ + $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR); \ fi; \ done endif # Installs run-time libraries -install_runtime: all | $(PREFIX)$(RUNTIME_PREFIX)lib +install_runtime: all | $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR) ifeq ($(HAVE_SHARED),y) $(INSTALL) -m 755 $(top_builddir)lib/lib*-$(VERSION).so \ - $(PREFIX)$(RUNTIME_PREFIX)lib - (cd $(top_builddir)lib && $(TAR) -cf - *.so.*) | $(TAR) -xf - -C $(PREFIX)$(RUNTIME_PREFIX)lib + $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR) + (cd $(top_builddir)lib && $(TAR) -cf - *.so.*) | $(TAR) -xf - -C $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR) @if [ -x $(top_builddir)lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so ] ; then \ set -e; \ $(SHELL_SET_X); \ $(INSTALL) -m 755 $(top_builddir)lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so \ - $(PREFIX)$(RUNTIME_PREFIX)lib; \ + $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR); \ fi endif -- cgit v1.2.3 From 9f811c9a0d095f5e91404c7ce2a6c33def2b4a66 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 12 Mar 2010 18:56:49 +0100 Subject: buildsys: fix dir order-only prereq of unifdef |$(@D) -> zilch, so spell it out Signed-off-by: Bernhard Reutner-Fischer --- Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 53828204d..6ac107d42 100644 --- a/Makefile.in +++ b/Makefile.in @@ -193,7 +193,8 @@ install: install_runtime install_dev RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell $(top_srcdir)extra/scripts/relative_path.sh $(DEVEL_PREFIX)$(MULTILIB_DIR) $(RUNTIME_PREFIX)$(MULTILIB_DIR)) -$(top_builddir)extra/scripts/unifdef: $(top_srcdir)extra/scripts/unifdef.c|$(@D) +$(top_builddir)extra/scripts/unifdef: |$(top_builddir)extra/scripts +$(top_builddir)extra/scripts/unifdef: $(top_srcdir)extra/scripts/unifdef.c $(hcompile.u) # Installs header files. -- cgit v1.2.3 From 93b4171a0ae5b44803120498825873ee2a8c4065 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 12 Mar 2010 19:13:49 +0100 Subject: buildsys: Fix O= PREFIX= case make sure that something like: $ rm -rf /dev/shm/o/* /dev/shm/o/.conf* /dev/shm/DELME $ time (make defconfig O=/dev/shm/o 2>&1 >& /dev/null && make \ install_dev -j O=/dev/shm/o PREFIX=/dev/shm/DELME 2>&1 >& /dev/null) works Signed-off-by: Bernhard Reutner-Fischer --- Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 6ac107d42..dca13ffe2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -305,7 +305,7 @@ endif install_dev: install_headers install_runtime | $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR) -$(INSTALL) -m 644 $(top_builddir)lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/ ifeq ($(HAVE_SHARED),y) - for i in `find $(top_builddir)lib/ -type l -name 'lib[a-zA-Z]*.so' | \ + for i in `cd $(top_builddir) && find lib/ -type l -name 'lib[a-zA-Z]*.so' | \ $(SED) -e 's/lib\///'` ; do \ $(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)$$i.$(MAJOR_VERSION) \ $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/$$i; \ @@ -343,7 +343,7 @@ ifeq ($(DOPIC),y) # # If we build shared libraries then the static libs are PIC... # # Make _pic.a symlinks to make mklibs.py and similar tools happy. if [ -d $(top_builddir)lib ] ; then \ - for i in `find $(top_builddir)lib/ -type f -name 'lib*.a' | $(SED) -e 's/lib\///'` ; do \ + for i in `cd $(top_builddir) && find lib/ -type f -name 'lib*.a' | $(SED) -e 's/lib\///'` ; do \ $(LN) -sf $$i $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/`echo $$i \ | $(SED) -e 's/\.a$$/_pic.a/'`; \ done ; \ -- cgit v1.2.3 From fa993b609581ef591472071b77cfb079b9e0dc87 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 12 Mar 2010 21:58:29 +0100 Subject: buildsys: touchup 'make dist' a tiny bit Signed-off-by: Bernhard Reutner-Fischer --- Makefile.in | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index dca13ffe2..048cd76a0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -459,11 +459,12 @@ distclean: clean $(MAKE) -C extra/config distclean dist release: - $(RM) -r ../uClibc-$(VERSION) ../uClibc-$(VERSION).tar.bz2 - mkdir -p ../uClibc-$(VERSION) - git archive HEAD |(cd ../uClibc-$(VERSION) && $(TAR) xf -) - $(TAR) cjf ../uClibc-$(VERSION).tar.bz2 -C .. uClibc-$(VERSION) - du -b ../uClibc-$(VERSION).tar.bz2 + $(RM) ../uClibc-$(VERSION).tar + git archive HEAD --format=tar --prefix=uClibc-$(VERSION)/ \ + > ../uClibc-$(VERSION).tar + cat ../uClibc-$(VERSION).tar | bzip2 -c9 > ../uClibc-$(VERSION).tar.bz2 + cat ../uClibc-$(VERSION).tar | xz -e -c8 > ../uClibc-$(VERSION).tar.xz + du -b ../uClibc-$(VERSION).tar.{bz2,xz} test check: test_compile $(Q)$(MAKE) -C test -- cgit v1.2.3 From abdbaa897b3d7b5b72c8521a38aa84cada242837 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Thu, 25 Mar 2010 15:17:10 +0100 Subject: prettify make clean Signed-off-by: Bernhard Reutner-Fischer --- Makefile.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 048cd76a0..aacb1ab6a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -9,7 +9,7 @@ # You shouldn't need to mess with anything beyond this point... #-------------------------------------------------------------- clean_targets := clean realclean distclean \ - objclean-y headers_clean-y utils_clean + objclean-y headers_clean-y CLEAN_utils noconfig_targets := menuconfig config oldconfig silentoldconfig randconfig \ defconfig allyesconfig allnoconfig \ release dist tags help @@ -148,9 +148,9 @@ endif $(target-headers-sysdep): | $(top_builddir)include/bits $(top_builddir)include/sys -sysdep_common_headers-clean: - $(RM) $(ALL_HEADERS_COMMON) -headers_clean-y += sysdep_common_headers-clean +HEADERCLEAN_common: + $(do_rm) $(ALL_HEADERS_COMMON) +headers_clean-y += HEADERCLEAN_common # The headers. Arch specific headers are specified via ARCH_HEADERS in # libc/sysdeps/linux/$(TARGET_ARCH)/Makefile.arch which appends those via @@ -446,7 +446,7 @@ include_clean: clean: include_clean $(Q)$(RM) -r $(top_builddir)lib $(top_builddir)include/bits - @$(MAKE) -C utils utils_clean + @$(MAKE) -C utils CLEAN_utils +$(MAKE) -s -C test clean @$(RM) $(top_builddir)include/linux $(top_builddir)include/asm* $(Q)$(RM) $(top_builddir)extra/scripts/unifdef -- cgit v1.2.3