[git commit] buildsys: tidy realclean

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Sat Mar 5 19:28:52 UTC 2016


commit: https://git.uclibc.org/uClibc++/commit/?id=c731e85714b6cb4fc41b946bb4a0012cab7c5a95
branch: https://git.uclibc.org/uClibc++/commit/?id=refs/heads/master

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 Makefile.in                   |  5 ++++-
 Rules.mak                     |  2 +-
 src/Makefile.in               |  3 ++-
 src/abi/libgcc_eh/Makefile.in |  4 ++--
 src/abi/libsupc/Makefile.in   |  6 +++---
 tests/Makefile.in             | 11 ++++++++---
 tests/testoutput/Makefile.in  |  2 +-
 7 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 2830e8e..873f962 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,6 +11,9 @@ include $(top_srcdir)extra/Makefile.in
 
 $(headers-y) $(libcxx-a-y) $(libcxx-so-y): include/system_configuration.h
 
+DISTCLEAN_tests:
+	$(Q)$(MAKE) -C tests distclean
+
 tests: lib
 	$(Q)$(MAKE) -C tests all
 
@@ -30,7 +33,7 @@ install: install-bin install-include install-lib
 clean: CLEAN_bin CLEAN_src
 	#$(MAKE) -C $(top_builddir)extra/locale clean
 
-realclean: clean DISTCLEAN_extra DISTCLEAN_include DISTCLEAN_src
+realclean: clean DISTCLEAN_extra DISTCLEAN_include DISTCLEAN_src DISTCLEAN_tests
 distclean: realclean DISTCLEAN_.config
 DISTCLEAN_.config:
 	$(do_rm) $(addprefix $(top_builddir),.config .config.cmd .config.old)
diff --git a/Rules.mak b/Rules.mak
index f4749c9..7b4b993 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -86,7 +86,7 @@ endif
 endif
 DESTDIR ?= $(PREFIX)
 
-clean_targets := clean distclean CLEAN_% DISTCLEAN_%
+clean_targets := clean realclean distclean CLEAN_% DISTCLEAN_%
 noconfig_targets := conf mconf \
 	menuconfig config oldconfig silentoldconfig randconfig \
 	defconfig allyesconfig allnoconfig $(clean_targets) \
diff --git a/src/Makefile.in b/src/Makefile.in
index d12343d..21c9a4a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -50,5 +50,6 @@ $(top_builddir)src/$(LIBNAME).so: $(libcxx-so-y)
 
 CLEAN_src:
 	$(do_rm) $(addprefix $(SRC_OUT), *.o abi/*.o libuClibc++* core)
-DISTCLEAN_src: DISTCLEAN_libgcc_eh DISTCLEAN_libsupc
+DISTCLEAN_src: DISTCLEAN_src/abi/libgcc_eh DISTCLEAN_src/abi/libsupc
+	$(do_rm) $(addprefix $(SRC_OUT), .*.dep abi/.*.dep)
 
diff --git a/src/abi/libgcc_eh/Makefile.in b/src/abi/libgcc_eh/Makefile.in
index 56ef68f..46b0017 100644
--- a/src/abi/libgcc_eh/Makefile.in
+++ b/src/abi/libgcc_eh/Makefile.in
@@ -19,6 +19,6 @@ $(LIBGCC_EH_DEP): $(LIBGCC_EH)
 	$(Q)$(if $(LIBGCC_EH),(cd $(LIBGCC_EH_OUT) && $(AR) x $(LIBGCC_EH)))
 	$(Q)echo "libgcc_eh-y := \$$(addprefix \$$(LIBGCC_EH_OUT),$(libgcc_eh-y))" > $@
 
-CLEAN_libgcc_eh: ;
-DISTCLEAN_libgcc_eh:
+CLEAN_src/abi/libgcc_eh: ;
+DISTCLEAN_src/abi/libgcc_eh:
 	$(do_rm) $(addprefix $(LIBGCC_EH_OUT),.*dep *.o)
diff --git a/src/abi/libsupc/Makefile.in b/src/abi/libsupc/Makefile.in
index 9e01d3b..89e0e8a 100644
--- a/src/abi/libsupc/Makefile.in
+++ b/src/abi/libsupc/Makefile.in
@@ -14,11 +14,11 @@ endif
 ifneq ($(libsupc-y),)
 $(libsupc-y): $(LIBSUP)
 endif
-$(LIBSUP_DEP): $(LIBSUP)
+$(LIBSUP_DEP): $(LIBSUP) $(LIBSUPC_OUT)Makefile.in
 	$(Q)$(RM) $(LIBSUPC_OUT).*dep $(LIBSUPC_OUT)*.o
 	$(Q)$(if $(LIBSUP),(cd $(LIBSUPC_OUT) && $(AR) x $(LIBSUP) && $(RM) $(OBJS-OMIT)))
 	$(Q)echo "libsupc-y := \$$(addprefix \$$(LIBSUPC_OUT),$(libsupc-y))" > $@
 
-CLEAN_libsupc: ;
-DISTCLEAN_libsupc:
+CLEAN_src/abi/libsupc: ;
+DISTCLEAN_src/abi/libsupc:
 	$(do_rm) $(addprefix $(LIBSUPC_OUT), .*dep *.o)
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 2b29e4c..d416ad5 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -5,7 +5,8 @@ WR_CXX := WRAPPER_INCLUDEDIR=-I$(top_srcdir)include WRAPPER_LIBDIR=-L$(top_build
 
 LDFLAGS := $(LDFLAGS-$(LIBNAME).so) $(call link.asneeded,-lgcc_s)
 
-TESTS_SRCS-y := $(wildcard *test.cpp)
+TESTS_SRCS   := $(wildcard *test.cpp)
+TESTS_SRCS-y := $(TESTS_SRCS)
 UTILITY_SRCS := testframework.cpp
 
 TESTS_OMIT-$(UCLIBCXX_HAS_WCHAR) := wchartest.cpp
@@ -36,6 +37,10 @@ $(ALLBIN): % : %.o $(UTILITY_OBJS)
 $(HOST_BIN): % : %.o $(HOST_UTILITY_OBJS)
 
 CLEAN_tests:
-	$(do_rm) $(addprefix $(TESTS_OUT),$(ALLBIN) $(HOST_BIN) *.o core)
+	$(do_rm) $(addprefix $(TESTS_OUT),$(patsubst %.cpp,%, $(TESTS_SRCS)) $(patsubst %.cpp,%-old, $(TESTS_SRCS)) *.o core)
+
+distclean: clean
+	$(Q)$(RM) $(addprefix $(TESTS_OUT), .*.dep)
+
+clean: CLEAN_tests/testoutput CLEAN_tests
 
-clean: CLEAN_testoutput CLEAN_tests
diff --git a/tests/testoutput/Makefile.in b/tests/testoutput/Makefile.in
index a197328..b5f8b55 100644
--- a/tests/testoutput/Makefile.in
+++ b/tests/testoutput/Makefile.in
@@ -3,5 +3,5 @@ TESTOUTPUT_OUT := $(TESTS_OUT)testoutput/
 test: all
 	cd $(TESTOUTPUT_DIR) && V="$(V)" ./runtests.sh $(if $(DODEBUG),DODEBUG)
 
-CLEAN_testoutput:
+CLEAN_tests/testoutput:
 	$(do_rm) $(addprefix $(TESTOUTPUT_OUT),*.test *.out)


More information about the uClibc-cvs mailing list