summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2005-05-20 19:02:51 +0000
committerEric Andersen <andersen@codepoet.org>2005-05-20 19:02:51 +0000
commit124af9f4b2b77b1510d88cfc8092c788d7e513c7 (patch)
treeccce720bef4c1c604417e2082cf9997a8d6dd7ab /Makefile
parent8028f35dbe29c5ace3883005e08ac91d873553b2 (diff)
Back out nptl changes, which for now will be done in branches/uClibc-nptl
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile17
1 files changed, 1 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index b7f4d8f70..062f6fb38 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ noconfig_targets := menuconfig config oldconfig randconfig \
defconfig allyesconfig allnoconfig clean distclean \
release tags TAGS
TOPDIR=./
--include Rules.mak
+include Rules.mak
DIRS = ldso libc libcrypt libresolv libnsl libutil libm libpthread librt
ifeq ($(strip $(UCLIBC_HAS_GETTEXT_AWARENESS)),y)
@@ -117,20 +117,6 @@ endif
fi
$(MAKE) -C libc/sysdeps/linux/common headers
$(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) headers
-ifeq ($(strip $(PTHREADS_NATIVE)),y)
- (cd include; \
- $(LN) -fs ../libpthread/nptl/sysdeps/pthread/pthread.h .; \
- $(LN) -fs ../libpthread/nptl/semaphore.h .);
- (cd include/bits; \
- $(LN) -fs ../../libpthread/nptl/sysdeps/unix/sysv/linux/$(TARGET_ARCH)/bits/pthreadtypes.h .; \
- $(LN) -fs ../../libpthread/nptl/sysdeps/unix/sysv/linux/$(TARGET_ARCH)/bits/semaphore.h .);
-else
- (cd include; \
- $(LN) -fs ../libpthread/linuxthreads/sysdeps/pthread/pthread.h .; \
- $(LN) -fs ../libpthread/linuxthreads/semaphore.h .);
- (cd include/bits; \
- $(LN) -fs ../../libpthread/linuxthreads/sysdeps/pthread/bits/pthreadtypes.h .);
-endif
# Command used to download source code
WGET:=wget --passive-ftp
@@ -360,7 +346,6 @@ clean:
done; \
fi;
@$(RM) include/linux include/asm*
- @$(RM) include/pthread.h include/semaphore.h
@if [ -d libc/sysdeps/linux/$(TARGET_ARCH) ]; then \
$(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) clean; \
fi;