Correct header cleanup, if threads are disabled, thanks to Jan-Benedict Glaw reportin...

diff --git a/Makefile.in b/Makefile.in
index bb6b68b..d44e63e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -346,8 +346,8 @@ clean:
        $(RM) libc/misc/internals/interp.c
        $(RM) include/fpu_control.h
        $(MAKE) -C extra/locale clean
-       $(MAKE) -C ldso ldso_headers_clean
-       $(MAKE) -C libpthread threads_headers_clean
+       $(MAKE) -C ldso headers_clean-y
+       $(MAKE) -C libpthread headers_clean-y
        $(MAKE) -C test clean
        $(MAKE) -C utils clean
        @set -e; \

diff --git a/libpthread/Makefile.in b/libpthread/Makefile.in
index 17a5adc..1ce452c 100644 (file)
--- a/libpthread/Makefile.in
+++ b/libpthread/Makefile.in
@@ -5,6 +5,7 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
+ifeq ($(UCLIBC_HAS_THREADS),y)
 ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
 DIRS:= $(PTNAME) $(PTNAME)_db
 libs: subdirs
@@ -33,6 +34,8 @@ else
        $(LN) -sf ../$(PTDIR)/sysdeps/pthread/bits/pthreadtypes.h $(top_builddir)include/bits/
 endif
 
+endif
+
 headers_clean-y+=threads_headers_clean
 
 threads_headers_clean:
@@ -40,6 +43,7 @@ threads_headers_clean:
                $(top_builddir)include/thread_db.h \
                $(top_builddir)include/bits/pthreadtypes.h $(top_builddir)include/bits/semaphore.h \
                $(top_builddir)include/bits/libc-lock.h $(top_builddir)include/bits/stdio-lock
+# note to sjhill: the clean target shouldn't depend on PTNAME/PTDIR
 ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
        $(RM)   $(PTNAME)/version.h $(PTDIR)/banner.h \
                $(PTDIR)/sysdeps/unix/sysv/linux/rtld-libc-lowlevellock.c