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.

1 files changed, 9 insertions, 13 deletions

diff --git a/libc/misc/wchar/Makefile b/libc/misc/wchar/Makefile
index 62b49f2ee..acff4dab6 100644
--- a/libc/misc/wchar/Makefile
+++ b/libc/misc/wchar/Makefile
@@ -24,13 +24,13 @@
 TOPDIR=../../../
 include $(TOPDIR)Rules.mak
 
-MSRC1=  wchar.c
-MOBJ1=  btowc.o wctob.o mbsinit.o mbrlen.o mbrtowc.o wcrtomb.o mbsrtowcs.o \
+MSRC := wchar.c
+MOBJ =	btowc.o wctob.o mbsinit.o mbrlen.o mbrtowc.o wcrtomb.o mbsrtowcs.o \
 	wcsrtombs.o _wchar_utf8sntowcs.o _wchar_wcsntoutf8s.o \
 	__mbsnrtowcs.o __wcsnrtombs.o wcwidth.o wcswidth.o
 
 ifeq ($(UCLIBC_HAS_LOCALE),y)
-	MOBJ1 += iconv.o
+	MOBJ += iconv.o
 endif
 
 # The stdio and time related wide functions are now built in the normal
@@ -43,22 +43,18 @@ endif
 # time:
 # wcsftime
 
-OBJS=$(MOBJ1)
+OBJS := $(MOBJ)
 
-OBJ_LIST=../../obj.misc.wchar
+OBJ_LIST := ../../obj.misc.wchar
 
 all: $(OBJ_LIST)
 
 $(OBJ_LIST): $(OBJS)
-	echo $(patsubst %, misc/wchar/%, $(OBJS)) > $(OBJ_LIST)
+	$(STRIPTOOL) -x -R .note -R .comment $^
+	echo $(patsubst %, misc/wchar/%, $^) > $@
 
-$(MOBJ1): $(MSRC1)
+$(MOBJ): $(MSRC)
 	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-	$(STRIPTOOL) -x -R .note -R .comment $*.o
-
-$(MOBJ2): $(MSRC2)
-	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 clean:
-	$(RM) *.[oa] *~ core
+	$(RM) *.o *~ core