summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2005-10-27 12:07:45 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2005-10-27 12:07:45 +0000
commitcc749773dcf3343f5aecb9cc4005531b35ecaaec (patch)
treef4745382b51842ae8216d0c80beebc2705c69c25
parent9b6de7341a42019768250eab5573bf727df3a64d (diff)
Correct header cleanup, if threads are disabled, thanks to Jan-Benedict Glaw reporting it.
-rw-r--r--Makefile.in4
-rw-r--r--libpthread/Makefile.in4
2 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index bb6b68bcc..d44e63e08 100644
--- 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 17a5adca9..1ce452c1b 100644
--- 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