diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-10-08 01:30:59 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-10-08 01:30:59 +0000 |
| commit | ded4332183bf5e662c30694237a8fe31b840fdf4 (patch) | |
| tree | b70e6afcf50613fb6549474493d337a870ab2a6c | |
| parent | 8e87f7ffea28e5b1bc693a40e7d79e6e6509eee9 (diff) | |
Fix up PTDIR bug and clean target for libpthread.
| -rw-r--r-- | Rules.mak | 22 | ||||
| -rw-r--r-- | libpthread/Makefile | 4 |
2 files changed, 15 insertions, 11 deletions
@@ -309,17 +309,17 @@ ifeq ($(strip $(UCLIBC_HAS_THREADS_NATIVE)),y) else PTNAME := linuxthreads endif -PTDIR := $(TOPDIR)libpthread/$(PTNAME)/ +PTDIR := $(TOPDIR)libpthread/$(PTNAME) # set up system dependencies include dirs (NOTE: order matters!) ifeq ($(strip $(UCLIBC_HAS_THREADS_NATIVE)),y) -PTINC := -I$(PTDIR)compat \ - -I$(PTDIR)sysdeps/unix/sysv/linux/$(TARGET_ARCH) \ - -I$(PTDIR)sysdeps/$(TARGET_ARCH) \ - -I$(PTDIR)sysdeps/unix/sysv/linux \ - -I$(PTDIR)sysdeps/pthread \ - -I$(PTDIR)sysdeps/pthread/bits \ - -I$(PTDIR)sysdeps/generic \ - -include $(PTDIR)compat/libc-symbols.h +PTINC := -I$(PTDIR)/compat \ + -I$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH) \ + -I$(PTDIR)/sysdeps/$(TARGET_ARCH) \ + -I$(PTDIR)/sysdeps/unix/sysv/linux \ + -I$(PTDIR)/sysdeps/pthread \ + -I$(PTDIR)/sysdeps/pthread/bits \ + -I$(PTDIR)/sysdeps/generic \ + -include $(PTDIR)/compat/libc-symbols.h # # Test for TLS if NPTL support was selected. # @@ -340,8 +340,8 @@ endif else # psm: the next 2 are probably incorrect, the generic header will # win over the arch specific one -PTINC := -I$(PTDIR)sysdeps/pthread \ - -I$(PTDIR)sysdeps/$(TARGET_ARCH) +PTINC := -I$(PTDIR)/sysdeps/pthread \ + -I$(PTDIR)/sysdeps/$(TARGET_ARCH) endif endif diff --git a/libpthread/Makefile b/libpthread/Makefile index 6a8bb6d91..96631bfd0 100644 --- a/libpthread/Makefile +++ b/libpthread/Makefile @@ -61,6 +61,10 @@ headers_clean: $(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 +ifeq ($(strip $(UCLIBC_HAS_THREADS_NATIVE)),y) + $(RM) $(PTNAME)/version.h $(PTDIR)/banner.h \ + $(PTDIR)/sysdeps/unix/sysv/linux/rtld-libc-lowlevellock.c +endif clean: subdirs_clean headers_clean |