diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-10-04 00:29:14 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-10-04 00:29:14 +0000 |
| commit | 8c7ac6fc362d2d958c97262032c7dbde3471b100 (patch) | |
| tree | e809e1f42e7b9059aaec495db5be4c90c119157e /libc/misc | |
| parent | 30ad5a705dad5ac4ccae99cbd00c1a05863de4de (diff) | |
Clean up pthread include mess. Some of these will be needed to support NPTL, but they do no harm for the linuxthreads case. Yes, I tested this.
Diffstat (limited to 'libc/misc')
| -rw-r--r-- | libc/misc/internals/Makefile | 4 | ||||
| -rw-r--r-- | libc/misc/pthread/Makefile | 12 | ||||
| -rw-r--r-- | libc/misc/syslog/Makefile | 4 |
3 files changed, 9 insertions, 11 deletions
diff --git a/libc/misc/internals/Makefile b/libc/misc/internals/Makefile index fee3eca70..1df05a934 100644 --- a/libc/misc/internals/Makefile +++ b/libc/misc/internals/Makefile @@ -31,6 +31,10 @@ __uClibc_main.o: CFLAGS += $(SSP_DISABLE_FLAGS) OBJS=$(COBJS) +ifeq ($(UCLIBC_HAS_THREADS),y) +CFLAGS += $(PTINC) +endif + OBJ_LIST=../../obj.misc.internals all: $(OBJ_LIST) interp.o static.o diff --git a/libc/misc/pthread/Makefile b/libc/misc/pthread/Makefile index 0e432d308..e222e1442 100644 --- a/libc/misc/pthread/Makefile +++ b/libc/misc/pthread/Makefile @@ -19,16 +19,6 @@ TOPDIR=../../../ include $(TOPDIR)Rules.mak -PTDIR = $(TOPDIR)libpthread/linuxthreads/ -SYSDEPINC = -I$(PTDIR)sysdeps/unix/sysv/linux \ - -I$(PTDIR)sysdeps/pthread \ - -I$(PTDIR)sysdeps/unix/sysv \ - -I$(PTDIR)sysdeps/unix/unix \ - -I$(PTDIR)sysdeps/$(TARGET_ARCH) \ - -I$(PTDIR)sysdeps \ - -I$(TOPDIR)libc/sysdeps/linux/$(TARGET_ARCH) -CFLAGS += $(SYSDEPINC) -D_GNU_SOURCE - CSRC=no-tsd.c weaks.c COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(COBJS) @@ -41,7 +31,7 @@ $(OBJ_LIST): $(OBJS) echo $(patsubst %, misc/pthread/%, $(OBJS)) > $(OBJ_LIST) $(COBJS): %.o : %.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $(PTINC) -c $< -o $@ $(STRIPTOOL) -x -R .note -R .comment $*.o clean: diff --git a/libc/misc/syslog/Makefile b/libc/misc/syslog/Makefile index 35e755e40..26239ab7b 100644 --- a/libc/misc/syslog/Makefile +++ b/libc/misc/syslog/Makefile @@ -28,6 +28,10 @@ CSRC=syslog.c COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(COBJS) +ifeq ($(UCLIBC_HAS_THREADS),y) +CFLAGS += $(PTINC) +endif + OBJ_LIST=../../obj.misc.syslog all: $(OBJ_LIST) |