summaryrefslogtreecommitdiff
path: root/libpthread
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2005-10-12 16:12:36 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2005-10-12 16:12:36 +0000
commit3a7ac9c7a7b4d6181d3cd70a9cb85d93a1938238 (patch)
treef87aedb508cd30ff8d50b75dbe832d34ac5dad85 /libpthread
parentb0c8130cec05f40ce926058d18fbc520b1a0e856 (diff)
Rewrote almost all Makefiles: do not use strip $(x),y; run strip on all objects at once; use :=//$</$^; use CRT_SRC/CRT_OBJ/SCRT_OBJ/CSRC/COBJ/SSRC/SOBJ/MSRC/MOBJ where no more is needed, if only CSRC is present use OBJS directly instead of COBJ; CTOR_TARGETS are created directly in lib; remove unused/unneeded parts. Hope I haven't broken too much.
Diffstat (limited to 'libpthread')
-rw-r--r--libpthread/Makefile8
-rw-r--r--libpthread/linuxthreads/Makefile8
-rw-r--r--libpthread/linuxthreads_db/Makefile2
3 files changed, 9 insertions, 9 deletions
diff --git a/libpthread/Makefile b/libpthread/Makefile
index 96631bfd0..43804795a 100644
--- a/libpthread/Makefile
+++ b/libpthread/Makefile
@@ -21,7 +21,7 @@ include $(TOPDIR)Rules.mak
ALL_SUBDIRS = $(PTNAME) $(PTNAME)_db
DIRS = $(PTNAME)
-ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
+ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
DIRS += $(PTNAME)_db
endif
@@ -32,10 +32,10 @@ all: subdirs
headers:
$(LN) -sf $(PTDIR)/sysdeps/pthread/pthread.h $(TOPDIR)include/
$(LN) -sf $(PTDIR)/semaphore.h $(TOPDIR)include/
-ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
+ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
$(LN) -sf $(PTDIR)_db/thread_db.h $(TOPDIR)include/
endif
-ifeq ($(strip $(UCLIBC_HAS_THREADS_NATIVE)),y)
+ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
$(LN) -sf ../$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH)/bits/semaphore.h $(TOPDIR)include/bits/
$(LN) -sf ../$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH)/bits/pthreadtypes.h $(TOPDIR)include/bits/
$(LN) -sf ../$(PTDIR)/sysdeps/pthread/bits/libc-lock.h $(TOPDIR)include/bits/
@@ -61,7 +61,7 @@ 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)
+ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
$(RM) $(PTNAME)/version.h $(PTDIR)/banner.h \
$(PTDIR)/sysdeps/unix/sysv/linux/rtld-libc-lowlevellock.c
endif
diff --git a/libpthread/linuxthreads/Makefile b/libpthread/linuxthreads/Makefile
index b8071598a..22779c37b 100644
--- a/libpthread/linuxthreads/Makefile
+++ b/libpthread/linuxthreads/Makefile
@@ -30,7 +30,7 @@ CFLAGS += $(PTINC)
ARCH_CFLAGS := $(CFLAGS)
-ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y)
+ifeq ($(UCLIBC_CTOR_DTOR),y)
SHARED_START_FILES = $(TOPDIR)lib/crti.o $(LIBGCC_DIR)crtbeginS.o
SHARED_END_FILES = $(LIBGCC_DIR)crtendS.o $(TOPDIR)lib/crtn.o
endif
@@ -45,13 +45,13 @@ ARCH_OBJS := $(patsubst %.c,%.o, $(ARCH_CSRC))
-include sysdeps/$(TARGET_ARCH)/Makefile.in
CSRC = $(wildcard *.c)
-ifneq ($(strip $(UCLIBC_HAS_XLOCALE)),y)
+ifneq ($(UCLIBC_HAS_XLOCALE),y)
CSRC := $(filter-out locale.c,$(CSRC))
endif
OBJS := $(patsubst %.c,%.o, $(CSRC))
-ifeq ($(strip $(HAVE_SHARED)),y)
+ifeq ($(HAVE_SHARED),y)
all: $(SO_LIB_NAME)
else
all: $(AR_LIB_NAME)
@@ -60,7 +60,7 @@ endif
$(AR_LIB_NAME): $(OBJS) $(ARCH_OBJS)
$(INSTALL) -d $(TOPDIR)lib
$(RM) $@
-ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
+ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
$(STRIPTOOL) -X --strip-debug -R .note -R .comment $^
else
$(STRIPTOOL) -x -R .note -R .comment $^
diff --git a/libpthread/linuxthreads_db/Makefile b/libpthread/linuxthreads_db/Makefile
index 102b1becf..4d2bf7c5f 100644
--- a/libpthread/linuxthreads_db/Makefile
+++ b/libpthread/linuxthreads_db/Makefile
@@ -36,7 +36,7 @@ CSRC := $(wildcard *.c)
OBJS := $(patsubst %.c,%.o, $(CSRC))
-ifeq ($(strip $(HAVE_SHARED)),y)
+ifeq ($(HAVE_SHARED),y)
all: $(SO_LIB_NAME)
else
all: $(AR_LIB_NAME)