scc

commit 72456108a4e48b4f41346d71679b0be281d69aba
parent 05bd001929ecd48cc48a10b8bd9acd7d6d0ecf7c
Author: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date:   Thu, 21 Sep 2017 13:00:37 +0100

Revert "Move library geneartion rule to libdep.mk"

This reverts commit 5b88d5faa321fd71a734d5c957c162aad46d7daf.
This commit was generating two actions for the same target in
the lib/scc Makefile.

Diffstat:
M
as/Makefile
 | 
3
+++
M
cc1/Makefile
 | 
3
+++
M
cc2/Makefile
 | 
3
+++
M
lib/scc/libdep.mk
 | 
5
-----

4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/as/Makefile b/as/Makefile
@@ -15,6 +15,9 @@ $(OBJ): $(HDR)
 as: $(OBJ)
 	$(CC) $(SCC_LDFLAGS) $(OBJ) -lscc -o $@
 
+$(LIBDIR)/libscc.a: $(LIB-OBJ)
+	cd $(LIBDIR) && $(MAKE)
+
 dep: ../config.mk Makefile
 	./gendep.sh $(TARGETS)
 	touch dep
diff --git a/cc1/Makefile b/cc1/Makefile
@@ -18,6 +18,9 @@ all:
 	mkdir -p ../rootdir/libexec/scc/
 	cp cc1-* ../rootdir/libexec/scc/
 
+$(LIBDIR)/libscc.a: $(LIB-OBJ)
+	cd $(LIBDIR) && $(MAKE)
+
 dep: ../config.mk Makefile
 	./gendep.sh $(TARGETS)
 	touch dep
diff --git a/cc2/Makefile b/cc2/Makefile
@@ -20,6 +20,9 @@ dep: ../config.mk Makefile
 	MKQBE=${MKQBE} ./gendep.sh $(TARGETS)
 	touch dep
 
+$(LIBDIR)/libscc.a: $(LIB-OBJ)
+	cd $(LIBDIR) && $(MAKE)
+
 main.o: error.h
 
 error.h: cc2.h
diff --git a/lib/scc/libdep.mk b/lib/scc/libdep.mk
@@ -6,8 +6,3 @@ LIB-OBJ = $(LIBDIR)/debug.o \
           $(LIBDIR)/xrealloc.o \
           $(LIBDIR)/xstrdup.o \
           $(LIBDIR)/alloc.o \
-
-all:
-
-$(LIBDIR)/libscc.a: $(LIB-OBJ)
-	cd $(LIBDIR) && $(MAKE)