svn commit: trunk/uClibc: ldso ldso/libdl libpthread

psm at uclibc.org psm at uclibc.org
Tue Oct 4 14:47:19 UTC 2005


Author: psm
Date: 2005-10-04 07:47:17 -0700 (Tue, 04 Oct 2005)
New Revision: 11752

Log:
Do not recurse into ldso/libc/libpthread on clean

Modified:
   trunk/uClibc/Makefile
   trunk/uClibc/ldso/Makefile
   trunk/uClibc/ldso/libdl/Makefile
   trunk/uClibc/libpthread/Makefile


Changeset:
Modified: trunk/uClibc/Makefile
===================================================================
--- trunk/uClibc/Makefile	2005-10-04 14:31:18 UTC (rev 11751)
+++ trunk/uClibc/Makefile	2005-10-04 14:47:17 UTC (rev 11752)
@@ -348,13 +348,13 @@
 
 clean:
 	@$(RM) -r lib include/bits
-	$(RM) */*.so */*.a
+	$(RM) libc/*.a libc/obj.* libc/nonshared_obj.*
 	$(RM) libc/misc/internals/interp.c
+	$(RM) ldso/libdl/*.a
 	$(RM) include/fpu_control.h
 	$(MAKE) -C extra/locale clean
-	$(MAKE) -C ldso clean
-	$(MAKE) -C libc clean
-	$(MAKE) -C libpthread clean
+	$(MAKE) -C ldso headers_clean
+	$(MAKE) -C libpthread headers_clean
 	$(MAKE) -C test clean
 	$(MAKE) -C utils clean
 	@set -e; \
@@ -370,9 +370,10 @@
 	@if [ -d libc/sysdeps/linux/$(TARGET_ARCH) ]; then		\
 	    $(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) clean;		\
 	fi
-	- find . \( -name \*.o -o -name core -o -name .\#\* \) -exec $(RM) {} \;
+	-find . -name \*.o -exec $(RM) {} \;
 
 distclean: clean
+	-find . \( -name core -o -name \*.orig -o -name \*~ -o -name .\#\* \) -exec $(RM) {} \;
 	$(RM) .config .config.old .config.cmd
 	$(RM) extra/locale/*.txt
 	$(MAKE) -C extra clean

Modified: trunk/uClibc/ldso/Makefile
===================================================================
--- trunk/uClibc/ldso/Makefile	2005-10-04 14:31:18 UTC (rev 11751)
+++ trunk/uClibc/ldso/Makefile	2005-10-04 14:47:17 UTC (rev 11752)
@@ -43,9 +43,11 @@
 	echo '#include "$(TARGET_ARCH)/elfinterp.c"' \
 		> include/dl-progname.h
 
-clean: subdirs_clean
+headers_clean:
 	$(RM) $(HEADERS)
 
+clean: subdirs_clean headers_clean
+
 subdirs: $(patsubst %, _dir_%, $(DIRS))
 subdirs_clean: $(patsubst %, _dirclean_%, $(DIRS))
 

Modified: trunk/uClibc/ldso/libdl/Makefile
===================================================================
--- trunk/uClibc/ldso/libdl/Makefile	2005-10-04 14:31:18 UTC (rev 11751)
+++ trunk/uClibc/ldso/libdl/Makefile	2005-10-04 14:47:17 UTC (rev 11752)
@@ -92,4 +92,4 @@
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	$(RM) *.o *~ core *.a
+	$(RM) *.[oa] *~ core

Modified: trunk/uClibc/libpthread/Makefile
===================================================================
--- trunk/uClibc/libpthread/Makefile	2005-10-04 14:31:18 UTC (rev 11751)
+++ trunk/uClibc/libpthread/Makefile	2005-10-04 14:47:17 UTC (rev 11752)
@@ -67,10 +67,12 @@
 $(patsubst %, _dirclean_%, $(ALL_SUBDIRS)) : dummy
 	$(MAKE) -C $(patsubst _dirclean_%, %, $@) clean
 
-clean: subdirs_clean
+headers_clean:
 	$(RM)	$(TOPDIR)include/pthread.h $(TOPDIR)include/semaphore.h \
 		$(TOPDIR)include/thread_db.h \
 		$(TOPDIR)include/bits/pthreadtypes.h $(TOPDIR)include/bits/semaphore.h \
 		$(TOPDIR)include/bits/libc-lock.h $(TOPDIR)include/bits/stdio-lock
 
+clean: subdirs_clean headers_clean
+
 .PHONY: dummy




More information about the uClibc-cvs mailing list