summaryrefslogtreecommitdiff
path: root/libpthread
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2005-10-29 10:16:07 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2005-10-29 10:16:07 +0000
commite6aa37afc9c281a04f40250b8fcd35302064a087 (patch)
tree5dd83379964b1d75792ace567fd56915168d182c /libpthread
parenta4753b1da2c2a1f7de691619a52e2934d2c248ac (diff)
Replace all Makefiles for new build infrastucture
Diffstat (limited to 'libpthread')
-rw-r--r--libpthread/Makefile74
-rw-r--r--libpthread/linuxthreads/Makefile90
-rw-r--r--libpthread/linuxthreads_db/Makefile67
3 files changed, 27 insertions, 204 deletions
diff --git a/libpthread/Makefile b/libpthread/Makefile
index 28ac45e73..2dea1b3e9 100644
--- a/libpthread/Makefile
+++ b/libpthread/Makefile
@@ -1,71 +1,15 @@
-# Makefile for uClibc's pthread library
+# Makefile for uClibc
#
-# Copyright (C) 2002 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
TOPDIR=../
-include $(TOPDIR)Rules.mak
-
-ALL_SUBDIRS = $(PTNAME) $(PTNAME)_db
-DIRS = $(PTNAME)
-ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
- DIRS += $(PTNAME)_db
-endif
-
-all: subdirs
-
-# NPTL does not have a generic pthreadtypes.h
-# and each arch has to have both semaphore.h/pthreadtypes.h ?
-headers:
- $(LN) -sf $(PTDIR)/sysdeps/pthread/pthread.h $(TOPDIR)include/
- $(LN) -sf $(PTDIR)/semaphore.h $(TOPDIR)include/
-ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
- $(LN) -sf $(PTDIR)_db/thread_db.h $(TOPDIR)include/
-endif
-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/
- $(LN) -sf ../$(PTDIR)/sysdeps/pthread/bits/stdio-lock.h $(TOPDIR)include/bits/
-else
- $(LN) -sf ../$(PTDIR)/sysdeps/pthread/bits/pthreadtypes.h $(TOPDIR)include/bits/
-endif
-
-tags:
- ctags -R
-
-subdirs: $(patsubst %, _dir_%, $(DIRS))
-subdirs_clean: $(patsubst %, _dirclean_%, $(ALL_SUBDIRS))
-
-$(patsubst %, _dir_%, $(DIRS)) : headers
- $(MAKE) -C $(patsubst _dir_%, %, $@)
-
-$(patsubst %, _dirclean_%, $(ALL_SUBDIRS)) : dummy
- $(MAKE) -C $(patsubst _dirclean_%, %, $@) clean
-
-headers_clean:
- $(RM) $(TOPDIR)include/pthread.h $(TOPDIR)include/semaphore.h \
- $(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 ($(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
-.PHONY: dummy
+top_srcdir=$(TOPDIR)
+top_builddir=../
+include $(top_builddir)Rules.mak
+all: libs
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libpthread/linuxthreads/Makefile b/libpthread/linuxthreads/Makefile
index 78364d785..f92f205a5 100644
--- a/libpthread/linuxthreads/Makefile
+++ b/libpthread/linuxthreads/Makefile
@@ -1,87 +1,15 @@
-# Makefile for uClibc's pthread library
+# Makefile for uClibc
#
-# Copyright (C) 2002 Erik Andersen <andersen@uclibc.org>
-# Copyright (C) 2003 Paul Mundt <lethal@linux-sh.org>
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
TOPDIR=../../
-include $(TOPDIR)Rules.mak
-
-CFLAGS+=$(SSP_ALL_CFLAGS)
-
-# This stuff will not compile without at least -O1
-CFLAGS :=$(CFLAGS:-O0=-O1)
-
-# Get the thread include dependencies
-CFLAGS += $(PTINC)
-
-ARCH_CFLAGS := $(CFLAGS)
-
-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
-
-LIB_NAME := libpthread
-AR_LIB_NAME := $(TOPDIR)lib/$(LIB_NAME).a
-SO_LIB_NAME = $(TOPDIR)lib/$(LIB_NAME).so
-SO_FULL_NAME = $(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
-
-ARCH_CSRC := $(wildcard sysdeps/$(TARGET_ARCH)/*.c)
-ARCH_OBJS := $(patsubst %.c,%.o, $(ARCH_CSRC))
--include sysdeps/$(TARGET_ARCH)/Makefile.arch
-
-CSRC = $(wildcard *.c)
-ifneq ($(UCLIBC_HAS_XLOCALE),y)
-CSRC := $(filter-out locale.c,$(CSRC))
-endif
-
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-ifeq ($(HAVE_SHARED),y)
-all: $(SO_LIB_NAME)
-else
-all: $(AR_LIB_NAME)
-endif
-
-$(AR_LIB_NAME): $(OBJS) $(ARCH_OBJS)
- $(INSTALL) -d $(TOPDIR)lib
- $(RM) $@
-ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
- $(STRIPTOOL) -X --strip-debug -R .note -R .comment $^
-else
- $(STRIPTOOL) -x -R .note -R .comment $^
-endif
- $(AR) $(ARFLAGS) $@ $(OBJS)
- $(AR) $(ARFLAGS) $@ $(ARCH_OBJS)
-
-$(SO_LIB_NAME): $(AR_LIB_NAME)
- $(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) $@
- $(LD) $(LDFLAGS_NOSTRIP) -soname=$(LIB_NAME).so.$(MAJOR_VERSION) \
- -o $(TOPDIR)lib/$(SO_FULL_NAME) $(SHARED_START_FILES) --whole-archive $< \
- --no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
- -L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC) $(SHARED_END_FILES)
- $(LN) -sf $(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION)
- $(LN) -sf $(SO_FULL_NAME) $@
-
-$(OBJS): %.o : %.c
- $(CC) $(CFLAGS) -c $< -o $@
-
-$(ARCH_OBJS): %.o : %.c
- $(CC) $(ARCH_CFLAGS) -c $< -o $@
-clean:
- $(RM) *.o sysdeps/*/*.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../
+include $(top_builddir)Rules.mak
+all: libs
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libpthread/linuxthreads_db/Makefile b/libpthread/linuxthreads_db/Makefile
index 5f9a39705..f92f205a5 100644
--- a/libpthread/linuxthreads_db/Makefile
+++ b/libpthread/linuxthreads_db/Makefile
@@ -1,64 +1,15 @@
-# Makefile for uClibc's pthread library
+# Makefile for uClibc
#
-# Copyright (C) 2002 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
TOPDIR=../../
-include $(TOPDIR)Rules.mak
-
-#CFLAGS+=$(SSP_ALL_CFLAGS)
-
-LIB_NAME := libthread_db
-AR_LIB_NAME := $(TOPDIR)lib/$(LIB_NAME).a
-SO_LIB_NAME = $(TOPDIR)lib/$(LIB_NAME).so
-SO_FULL_NAME = $(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
-
-# Get the thread include dependencies and shared object name
-CFLAGS += $(PTINC) -DLIBPTHREAD_SO="\"libpthread.so.$(MAJOR_VERSION)\""
-
-# Remove any -z defs since this lib will have undefined symbols
-LDFLAGS := $(subst -z defs,,$(LDFLAGS)) --warn-unresolved-symbols
-
-CSRC := $(wildcard *.c)
-
-OBJS := $(patsubst %.c,%.o, $(CSRC))
-
-ifeq ($(HAVE_SHARED),y)
-all: $(SO_LIB_NAME)
-else
-all: $(AR_LIB_NAME)
-endif
-
-$(AR_LIB_NAME): $(OBJS)
- $(INSTALL) -d $(TOPDIR)lib
- $(RM) $@
- $(STRIPTOOL) -x -R .note -R .comment $^
- $(AR) $(ARFLAGS) $@ $^
-
-$(SO_LIB_NAME): $(AR_LIB_NAME)
- $(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).1 $@
- $(LD) $(LDFLAGS) -soname=$(LIB_NAME).so.1 \
- -o $(TOPDIR)lib/$(SO_FULL_NAME) --whole-archive $< \
- --no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
- -L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC)
- $(LN) -sf $(SO_FULL_NAME) $(SO_LIB_NAME).1
- $(LN) -sf $(SO_FULL_NAME) $@
-
-$(OBJS): %.o : %.c
- $(CC) $(CFLAGS) -c $< -o $@
-clean:
- $(RM) *.o *~ core
+top_srcdir=$(TOPDIR)
+top_builddir=../../
+include $(top_builddir)Rules.mak
+all: libs
+include Makefile.in
+include $(top_srcdir)Makerules