Rewrote almost all Makefiles: do not use strip $(x),y; run strip on all objects at once; use :=//$</$^; use CRT_SRC/CRT_OBJ/SCRT_OBJ/CSRC/COBJ/SSRC/SOBJ/MSRC/MOBJ where no more is needed, if only CSRC is present use OBJS directly instead of COBJ; CTOR_TARGETS are created directly in lib; remove unused/unneeded parts. Hope I haven't broken too much.

4 files changed, 45 insertions, 56 deletions

diff --git a/libc/stdlib/Makefile b/libc/stdlib/Makefile
index 49d739703..fa360e4c9 100644
--- a/libc/stdlib/Makefile
+++ b/libc/stdlib/Makefile
@@ -24,31 +24,28 @@
 TOPDIR=../../
 include $(TOPDIR)Rules.mak
 
-DIRS:=
+DIRS =
 ifeq ($(MALLOC),y)
-    DIRS+=malloc
+    DIRS += malloc
 endif
 ifeq ($(MALLOC_SIMPLE),y)
-    DIRS+=malloc-simple
+    DIRS += malloc-simple
 endif
 ifeq ($(MALLOC_STANDARD),y)
-    DIRS+=malloc-standard
+    DIRS += malloc-standard
 endif
 
-
-MSRC = stdlib.c
+MSRC := stdlib.c
 MOBJ = abs.o labs.o atoi.o atol.o strtol.o strtoul.o _stdlib_strto_l.o \
        qsort.o bsearch.o \
        llabs.o atoll.o strtoll.o strtoull.o _stdlib_strto_ll.o
 # (aliases) strtoq.o strtouq.o
 ifeq ($(UCLIBC_HAS_XLOCALE),y)
-
-MOBJx =
-MOBJx += strtol_l.o strtoul_l.o _stdlib_strto_l_l.o \
+MOBJx = strtol_l.o strtoul_l.o _stdlib_strto_l_l.o \
 	 strtoll_l.o strtoull_l.o _stdlib_strto_ll_l.o
 endif
 
-MSRC1 = strtod.c
+MSRC1 := strtod.c
 MOBJ1 = 
 MOBJ1x =
 
@@ -78,7 +75,7 @@ endif
 # (aliases) wcstoq.o wcstouq.o
 # wcstod wcstof wcstold
 
-MSRC2 = atexit.c
+MSRC2 := atexit.c
 MOBJ2 = on_exit.o __cxa_atexit.o __cxa_finalize.o __exit_handler.o exit.o
 ifeq ($(COMPAT_ATEXIT),y)
 MOBJ2 += old_atexit.o
@@ -94,49 +91,43 @@ CSRC = \
 ifeq ($(UCLIBC_HAS_FLOATS),y)
 	CSRC += drand48.c drand48_r.c erand48.c erand48_r.c
 endif
-COBJS=$(patsubst %.c,%.o, $(CSRC))
+COBJ := $(patsubst %.c,%.o, $(CSRC))
 
-OBJS=$(MOBJ) $(MOBJx) $(MOBJ1) $(MOBJ1x) $(MOBJ2) $(COBJS)
+OBJS := $(MOBJ) $(MOBJx) $(MOBJ1) $(MOBJ1x) $(MOBJ2) $(COBJ)
 
-NONSHARED_OBJS=atexit.o
+NONSHARED_OBJS := atexit.o
 
-OBJ_LIST=../obj.stdlib
+OBJ_LIST := ../obj.stdlib
 
-NONSHARED_OBJ_LIST=../nonshared_obj.stdlib
+NONSHARED_OBJ_LIST := ../nonshared_obj.stdlib
 
 all: $(OBJ_LIST) $(NONSHARED_OBJ_LIST) subdirs
 
 $(OBJ_LIST): $(OBJS)
-	echo $(patsubst %, stdlib/%, $(OBJS)) > $(OBJ_LIST)
+	$(STRIPTOOL) -x -R .note -R .comment $^
+	echo $(patsubst %, stdlib/%, $^) > $@
 
 $(NONSHARED_OBJ_LIST): $(NONSHARED_OBJS)
-	echo $(patsubst %, stdlib/%, $(NONSHARED_OBJS)) > $(NONSHARED_OBJ_LIST)
+	$(STRIPTOOL) -x -R .note -R .comment $^
+	echo $(patsubst %, stdlib/%, $^) > $@
 
 $(MOBJ): $(MSRC)
 	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 $(MOBJx): $(MSRC)
 	$(CC) $(CFLAGS) -DL_$* -D__UCLIBC_DO_XLOCALE $< -c -o $*.o
-	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 $(MOBJ1): $(MSRC1)
 	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 $(MOBJ1x): $(MSRC1)
 	$(CC) $(CFLAGS) -DL_$* -D__UCLIBC_DO_XLOCALE $< -c -o $*.o
-	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 $(MOBJ2) atexit.o: $(MSRC2)
 	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
-$(COBJS): %.o : %.c
+$(COBJ): %.o : %.c
 	$(CC) $(CFLAGS) -c $< -o $@
-	$(STRIPTOOL) -x -R .note -R .comment $*.o
-
-$(OBJ): Makefile
 
 subdirs: $(patsubst %, _dir_%, $(DIRS))
 subdirs_clean: $(patsubst %, _dirclean_%, $(ALL_SUBDIRS))
@@ -148,6 +139,6 @@ $(patsubst %, _dirclean_%, $(ALL_SUBDIRS)) : dummy
 	$(MAKE) -C $(patsubst _dirclean_%, %, $@) clean
 
 clean: subdirs_clean
-	$(RM) *.[oa] *~ core
+	$(RM) *.o *~ core
 
 .PHONY: dummy
diff --git a/libc/stdlib/malloc-simple/Makefile b/libc/stdlib/malloc-simple/Makefile
index 161aece1a..6f2d25e42 100644
--- a/libc/stdlib/malloc-simple/Makefile
+++ b/libc/stdlib/malloc-simple/Makefile
@@ -23,20 +23,21 @@
 TOPDIR=../../../
 include $(TOPDIR)Rules.mak
 
-MSRC=alloc.c
-MOBJ=malloc.o realloc.o free.o calloc.o memalign.o
-OBJS=$(MOBJ)
+MSRC := alloc.c
+MOBJ := malloc.o realloc.o free.o calloc.o memalign.o
 
-OBJ_LIST=../../obj.stdlib.malloc-simple
+OBJS := $(MOBJ)
+
+OBJ_LIST := ../../obj.stdlib.malloc-simple
 
 all: $(OBJ_LIST)
 
 $(OBJ_LIST): $(OBJS)
-	echo $(patsubst %, stdlib/malloc-simple/%, $(OBJS)) > $(OBJ_LIST)
+	$(STRIPTOOL) -x -R .note -R .comment $^
+	echo $(patsubst %, stdlib/malloc-simple/%, $^) > $@
 
 $(MOBJ): $(MSRC)
 	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	$(RM) *.[oa] *~ core
+	$(RM) *.o *~ core
diff --git a/libc/stdlib/malloc-standard/Makefile b/libc/stdlib/malloc-standard/Makefile
index 331feae20..1e3d358bc 100644
--- a/libc/stdlib/malloc-standard/Makefile
+++ b/libc/stdlib/malloc-standard/Makefile
@@ -29,28 +29,26 @@ ifeq ($(UCLIBC_MALLOC_DEBUGGING),y)
 CFLAGS += -D__MALLOC_DEBUGGING
 endif
 
-# calloc.c can be found at uClibc/libc/stdlib/calloc.c
-# valloc.c can be found at uClibc/libc/stdlib/valloc.c
-CSRC=malloc.c calloc.c realloc.c free.c memalign.c mallopt.c mallinfo.c
-
-COBJS=$(patsubst %.c,%.o, $(CSRC))
-
-OBJS=$(COBJS)
-
 ifeq ($(UCLIBC_HAS_THREADS),y)
 CFLAGS += $(PTINC)
 endif
 
-OBJ_LIST=../../obj.stdlib.malloc-standard
+# calloc.c can be found at uClibc/libc/stdlib/calloc.c
+# valloc.c can be found at uClibc/libc/stdlib/valloc.c
+CSRC := malloc.c calloc.c realloc.c free.c memalign.c mallopt.c mallinfo.c
+
+OBJS := $(patsubst %.c,%.o, $(CSRC))
+
+OBJ_LIST := ../../obj.stdlib.malloc-standard
 
 all: $(OBJ_LIST)
 
 $(OBJ_LIST): $(OBJS)
-	echo $(patsubst %, stdlib/malloc-standard/%, $(OBJS)) > $(OBJ_LIST)
+	$(STRIPTOOL) -x -R .note -R .comment $^
+	echo $(patsubst %, stdlib/malloc-standard/%, $^) > $@
 
-$(COBJS): %.o : %.c
+$(OBJS): %.o : %.c
 	$(CC) $(CFLAGS) -c $< -o $@
-	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	$(RM) *.[oa] *~ core
+	$(RM) *.o *~ core
diff --git a/libc/stdlib/malloc/Makefile b/libc/stdlib/malloc/Makefile
index e4a6f3a43..af67064fb 100644
--- a/libc/stdlib/malloc/Makefile
+++ b/libc/stdlib/malloc/Makefile
@@ -36,23 +36,22 @@ CFLAGS += -DMALLOC_MMB_DEBUGGING
 endif
 endif
 
-COBJS=$(patsubst %.c,%.o, $(CSRC))
-OBJS=$(COBJS)
+OBJS := $(patsubst %.c,%.o, $(CSRC))
 
-OBJ_LIST=../../obj.stdlib.malloc
+OBJ_LIST := ../../obj.stdlib.malloc
 
 all: $(OBJ_LIST)
 
 $(OBJ_LIST): $(OBJS)
-	echo $(patsubst %, stdlib/malloc/%, $(OBJS)) > $(OBJ_LIST)
+	$(STRIPTOOL) -x -R .note -R .comment $^
+	echo $(patsubst %, stdlib/malloc/%, $^) > $@
 
 malloc.o free.o realloc.o memalign.o: malloc.h
-$(COBJS): heap.h
+$(OBJS): heap.h
 
 # Depend on uClinux_config.h to cache changes in __UCLIBC_MALLOC_DEBUGGING__
-$(COBJS): %.o : %.c ../../../include/bits/uClibc_config.h
+$(OBJS): %.o : %.c ../../../include/bits/uClibc_config.h
 	$(CC) $(CFLAGS) -c $< -o $@
-	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	$(RM) *.[oa] *~ core
+	$(RM) *.o *~ core