summaryrefslogtreecommitdiffstats
path: root/libc
diff options
context:
space:
mode:
author"Steven J. Hill" <sjhill@realitydiluted.com>2005-07-22 05:15:47 +0000
committer"Steven J. Hill" <sjhill@realitydiluted.com>2005-07-22 05:15:47 +0000
commiteb6ed4fe445d1d604a6deab019d547f78540127e (patch)
tree18c7330002ea33abdc97c8b95678ac518d81b708 /libc
parent1dfbbd5f31e77a66e8c8b6f9e40e16277eb9f39d (diff)
downloaduClibc-alpine-eb6ed4fe445d1d604a6deab019d547f78540127e.tar.bz2
uClibc-alpine-eb6ed4fe445d1d604a6deab019d547f78540127e.tar.xz
Massive clean up of makefiles with a focus on being able to compile correctly
both thread library models. Items of interest are the 'Rules.mak' changes at the top level as well as the new 'Rules.mak' for the NPTL library.
Diffstat (limited to 'libc')
-rw-r--r--libc/inet/Makefile8
-rw-r--r--libc/inet/rpc/Makefile2
-rw-r--r--libc/misc/internals/Makefile4
-rw-r--r--libc/misc/pthread/Makefile4
-rw-r--r--libc/misc/syslog/Makefile2
-rw-r--r--libc/string/Makefile2
6 files changed, 10 insertions, 12 deletions
diff --git a/libc/inet/Makefile b/libc/inet/Makefile
index 09b274dab..e7018db7c 100644
--- a/libc/inet/Makefile
+++ b/libc/inet/Makefile
@@ -66,19 +66,19 @@ $(OBJ_LIST): $(OBJS)
echo $(patsubst %, inet/%, $(OBJS)) > $(OBJ_LIST)
$(MOBJ): $(MSRC)
- $(CC) $(CFLAGS) $(PT_INCLUDES) -DL_$* $< -c -o $*.o
+ $(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
$(STRIPTOOL) -x -R .note -R .comment $*.o
$(MOBJ2): $(MSRC2)
- $(CC) $(CFLAGS) $(PT_INCLUDES) -DL_$* $< -c -o $*.o
+ $(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
$(STRIPTOOL) -x -R .note -R .comment $*.o
$(MOBJ3): $(MSRC3)
- $(CC) $(CFLAGS) $(PT_INCLUDES) -DL_$* $< -c -o $*.o
+ $(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
$(STRIPTOOL) -x -R .note -R .comment $*.o
$(COBJS): %.o : %.c
- $(CC) $(CFLAGS) $(PT_INCLUDES) -c $< -o $@
+ $(CC) $(CFLAGS) -c $< -o $@
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean: subdirs_clean
diff --git a/libc/inet/rpc/Makefile b/libc/inet/rpc/Makefile
index 49adb7e84..a08cf89ea 100644
--- a/libc/inet/rpc/Makefile
+++ b/libc/inet/rpc/Makefile
@@ -57,7 +57,7 @@ $(OBJ_LIST): $(OBJS)
echo $(patsubst %, inet/rpc/%, $(OBJS)) > $(OBJ_LIST)
$(COBJS): %.o : %.c
- $(CC) $(CFLAGS) $(PT_INCLUDES) -c $< -o $@
+ $(CC) $(CFLAGS) $(PTINC) -c $< -o $@
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
diff --git a/libc/misc/internals/Makefile b/libc/misc/internals/Makefile
index fa34ccf89..23816b38d 100644
--- a/libc/misc/internals/Makefile
+++ b/libc/misc/internals/Makefile
@@ -45,11 +45,11 @@ interp.c: Makefile
echo "#endif" >> interp.c
interp.o: interp.c
- $(CC) $(CFLAGS) $(PT_INCLUDES) -c $< -o $@
+ $(CC) $(CFLAGS) -c $< -o $@
$(STRIPTOOL) -x -R .note -R .comment $*.o
$(COBJS): %.o : %.c
- $(CC) $(CFLAGS) $(PT_INCLUDES) -c $< -o $@
+ $(CC) $(CFLAGS) -c $< -o $@
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
diff --git a/libc/misc/pthread/Makefile b/libc/misc/pthread/Makefile
index cee80a9ac..e222e1442 100644
--- a/libc/misc/pthread/Makefile
+++ b/libc/misc/pthread/Makefile
@@ -19,8 +19,6 @@
TOPDIR=../../../
include $(TOPDIR)Rules.mak
-CFLAGS += $(PT_INCLUDES)
-
CSRC=no-tsd.c weaks.c
COBJS=$(patsubst %.c,%.o, $(CSRC))
OBJS=$(COBJS)
@@ -33,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 3ddd2737b..35e755e40 100644
--- a/libc/misc/syslog/Makefile
+++ b/libc/misc/syslog/Makefile
@@ -36,7 +36,7 @@ $(OBJ_LIST): $(OBJS)
echo $(patsubst %, misc/syslog/%, $(OBJS)) > $(OBJ_LIST)
$(COBJS): %.o : %.c
- $(CC) $(CFLAGS) $(PT_INCLUDES) -c $< -o $@
+ $(CC) $(CFLAGS) -c $< -o $@
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
diff --git a/libc/string/Makefile b/libc/string/Makefile
index 111bf2fdb..4150e403e 100644
--- a/libc/string/Makefile
+++ b/libc/string/Makefile
@@ -64,7 +64,7 @@ endif
OBJS=$(MOBJ) $(MOBJx)
ifeq ($(UCLIBC_HAS_WCHAR),y)
- OBJS += $(MOBJW) $(MOBJWx)
+OBJS += $(MOBJW) $(MOBJWx)
endif
OBJ_LIST=../obj.string