From 8c7ac6fc362d2d958c97262032c7dbde3471b100 Mon Sep 17 00:00:00 2001
From: "\"Steven J. Hill\"" <sjhill@realitydiluted.com>
Date: Tue, 4 Oct 2005 00:29:14 +0000
Subject: 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.

---
 libc/inet/Makefile     | 4 ++++
 libc/inet/rpc/Makefile | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'libc/inet')

diff --git a/libc/inet/Makefile b/libc/inet/Makefile
index e7018db7c..6d59e1856 100644
--- a/libc/inet/Makefile
+++ b/libc/inet/Makefile
@@ -56,6 +56,10 @@ CSRC =getservice.c getproto.c hostid.c getnetent.c getnetbynm.c getnetbyad.c \
 
 COBJS=$(patsubst %.c,%.o, $(CSRC))
 
+ifeq ($(UCLIBC_HAS_THREADS),y)
+CFLAGS += $(PTINC)
+endif
+
 OBJS=$(MOBJ) $(MOBJ2) $(MOBJ3) $(COBJS)
 
 OBJ_LIST=../obj.inet
diff --git a/libc/inet/rpc/Makefile b/libc/inet/rpc/Makefile
index 352e9a28b..a08cf89ea 100644
--- a/libc/inet/rpc/Makefile
+++ b/libc/inet/rpc/Makefile
@@ -23,7 +23,6 @@
 
 TOPDIR=../../../
 include $(TOPDIR)Rules.mak
-CFLAGS+=-I$(TOPDIR)libpthread/linuxthreads/sysdeps/pthread
 
 ifeq ($(strip $(UCLIBC_HAS_FULL_RPC)),y)
 CSRC :=auth_none.c auth_unix.c authunix_prot.c bindresvport.c \
@@ -58,7 +57,7 @@ $(OBJ_LIST): $(OBJS)
 	echo $(patsubst %, inet/rpc/%, $(OBJS)) > $(OBJ_LIST)
 
 $(COBJS): %.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(CFLAGS) $(PTINC) -c $< -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-- 
cgit v1.2.3