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, 10 insertions, 11 deletions

diff --git a/libc/termios/Makefile b/libc/termios/Makefile
index 4e43039eb..95210d7a9 100644
--- a/libc/termios/Makefile
+++ b/libc/termios/Makefile
@@ -24,30 +24,29 @@
 TOPDIR=../../
 include $(TOPDIR)Rules.mak
 
-MSRC=termios.c
-MOBJ= tcdrain.o tcflow.o tcflush.o tcsendbreak.o tcsetpgrp.o tcgetpgrp.o \
+MSRC := termios.c
+MOBJ := tcdrain.o tcflow.o tcflush.o tcsendbreak.o tcsetpgrp.o tcgetpgrp.o \
 	isatty.o cfgetospeed.o cfgetispeed.o cfsetospeed.o cfsetispeed.o \
 	cfmakeraw.o cfsetspeed.o
 
+CSRC := tcgetattr.c tcgetsid.c tcsetattr.c ttyname.c
+COBJ := $(patsubst %.c,%.o, $(CSRC))
 
-CSRC=tcgetattr.c tcgetsid.c tcsetattr.c ttyname.c
-COBJS=$(patsubst %.c,%.o, $(CSRC))
-OBJS=$(MOBJ) $(COBJS)
+OBJS := $(MOBJ) $(COBJ)
 
-OBJ_LIST=../obj.termios
+OBJ_LIST := ../obj.termios
 
 all: $(OBJ_LIST)
 
 $(OBJ_LIST): $(OBJS)
-	echo $(patsubst %, termios/%, $(OBJS)) > $(OBJ_LIST)
+	$(STRIPTOOL) -x -R .note -R .comment $^
+	echo $(patsubst %, termios/%, $^) > $@
 
 $(MOBJ): $(MSRC)
 	$(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
 
 clean:
-	$(RM) *.[oa] *~ core
+	$(RM) *.o *~ core