diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-10-08 01:31:57 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-10-08 01:31:57 +0000 |
| commit | e7b47af3cd8428e8e6b66ba9d35c667076bec57c (patch) | |
| tree | be4202f85e0a6f13c1a635855394ddde3a2d7654 | |
| parent | e9318574fecb1f861bb0a321a96c3b55f3b331ee (diff) | |
| download | uClibc-alpine-e7b47af3cd8428e8e6b66ba9d35c667076bec57c.tar.bz2 uClibc-alpine-e7b47af3cd8428e8e6b66ba9d35c667076bec57c.tar.xz | |
Sync with trunk.
| -rw-r--r-- | Rules.mak | 22 | ||||
| -rw-r--r-- | libcrypt/Makefile | 20 | ||||
| -rw-r--r-- | libpthread/Makefile | 4 | ||||
| -rw-r--r-- | libutil/Makefile | 20 |
4 files changed, 33 insertions, 33 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/libcrypt/Makefile b/libcrypt/Makefile index 2b129a8e2..86781e4c5 100644 --- a/libcrypt/Makefile +++ b/libcrypt/Makefile @@ -33,31 +33,29 @@ SO_FULL_NAME=$(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so CSRC = $(wildcard *.c) -OBJS=$(patsubst %.c,%.o, $(CSRC)) - ifeq ($(strip $(HAVE_SHARED)),y) all: $(SO_LIB_NAME) else all: $(AR_LIB_NAME) endif -$(AR_LIB_NAME): $(OBJS) +$(AR_LIB_NAME): $(LIB_NAME).o $(INSTALL) -d $(TOPDIR)lib - $(RM) $(AR_LIB_NAME) - $(AR) $(ARFLAGS) $(AR_LIB_NAME) $(OBJS) + $(RM) $@ + $(AR) $(ARFLAGS) $@ $< $(SO_LIB_NAME): $(AR_LIB_NAME) - $(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) $(SO_LIB_NAME) + $(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) $@ $(LD) $(LDFLAGS) -soname=$(LIB_NAME).so.$(MAJOR_VERSION) \ - -o $(TOPDIR)lib/$(SO_FULL_NAME) --whole-archive $(AR_LIB_NAME) \ + -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).$(MAJOR_VERSION) - $(LN) -sf $(SO_FULL_NAME) $(SO_LIB_NAME) + $(LN) -sf $(SO_FULL_NAME) $@ -$(OBJS): %.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ - $(STRIPTOOL) -x -R .note -R .comment $*.o +$(LIB_NAME).o: $(CSRC) + $(CC) $(CFLAGS) -o $@ -c $^ + $(STRIPTOOL) -x -R .note -R .comment $@ clean: $(RM) *.o *~ core 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 diff --git a/libutil/Makefile b/libutil/Makefile index 6cd07e5e9..e825b2aba 100644 --- a/libutil/Makefile +++ b/libutil/Makefile @@ -36,31 +36,29 @@ ifneq ($(strip $(ARCH_HAS_MMU)),y) CSRC := $(filter-out forkpty.c,$(CSRC)) endif -OBJS=$(patsubst %.c,%.o, $(CSRC)) - ifeq ($(strip $(HAVE_SHARED)),y) all: $(SO_LIB_NAME) else all: $(AR_LIB_NAME) endif -$(AR_LIB_NAME): $(OBJS) +$(AR_LIB_NAME): $(LIB_NAME).o $(INSTALL) -d $(TOPDIR)lib - $(RM) $(AR_LIB_NAME) - $(AR) $(ARFLAGS) $(AR_LIB_NAME) $(OBJS) + $(RM) $@ + $(AR) $(ARFLAGS) $@ $< $(SO_LIB_NAME): $(AR_LIB_NAME) - $(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) $(SO_LIB_NAME) + $(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) $@ $(LD) $(LDFLAGS) -soname=$(LIB_NAME).so.$(MAJOR_VERSION) \ - -o $(TOPDIR)lib/$(SO_FULL_NAME) --whole-archive $(AR_LIB_NAME) \ + -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).$(MAJOR_VERSION) - $(LN) -sf $(SO_FULL_NAME) $(SO_LIB_NAME) + $(LN) -sf $(SO_FULL_NAME) $@ -$(OBJS): %.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ - $(STRIPTOOL) -x -R .note -R .comment $*.o +$(LIB_NAME).o: $(CSRC) + $(CC) $(CFLAGS) -o $@ -c $^ + $(STRIPTOOL) -x -R .note -R .comment $@ clean: $(RM) *.o *~ core |