scc

commit 1c715e73cefa315a9ca50bd904ee38380f1ba4a5
parent f0784dfdcc232541c1361de9731acf38cd230f23
Author: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date:   Tue,  8 Jan 2019 14:49:00 +0000

[objdump] Move objdump to src/cmd

Diffstat:
M
src/Makefile
 | 
2
+-
M
src/cmd/Makefile
 | 
4
++++
R
src/objdump/objdump.c -> src/cmd/objdump.c
 | 
0

D
src/objdump/Makefile
 | 
16
----------------
D
src/objdump/deps.mk
 | 
3
---

5 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/src/Makefile b/src/Makefile
@@ -3,7 +3,7 @@
 PROJECTDIR = ..
 include $(PROJECTDIR)/scripts/rules.mk
 
-TOOLS = cc1 cc2 ld as objdump cmd
+TOOLS = cc1 cc2 ld as cmd
 LIBS  = libscc libc libcrt libmach
 DIRS  = $(TOOLS) $(LIBS)
 
diff --git a/src/cmd/Makefile b/src/cmd/Makefile
@@ -8,6 +8,7 @@ TARGET = $(BINDIR)/nm \
          $(BINDIR)/size \
          $(BINDIR)/ar \
          $(BINDIR)/ranlib \
+         $(BINDIR)/objdump \
 
 LIBS   = -lmach
 
@@ -27,6 +28,9 @@ $(BINDIR)/size: size.o
 $(BINDIR)/ranlib: ranlib.o
 	$(CC) $(SCC_LDFLAGS) ranlib.o -lmach -o $@
 
+$(BINDIR)/objdump: objdump.o
+	$(CC) $(SCC_LDFLAGS) objdump.o -lmach -o $@
+
 $(BINDIR)/ar: ar.o ar-$(DRIVER).o
 	$(CC) $(SCC_LDFLAGS) ar.o ar-$(DRIVER).o -o $@
 
diff --git a/src/objdump/objdump.c b/src/cmd/objdump.c
diff --git a/src/objdump/Makefile b/src/objdump/Makefile
@@ -1,16 +0,0 @@
-.POSIX:
-
-PROJECTDIR = ../..
-include $(PROJECTDIR)/scripts/rules.mk
-
-OBJS = objdump.o 
-TARGET = $(BINDIR)/objdump
-
-all: $(TARGET)
-
-$(TARGET): $(OBJS) $(LIBDIR)/libmach.a
-	$(CC) $(SCC_LDFLAGS) $(OBJS) -lscc -o $@
-
-dep: inc-dep
-
-include deps.mk
diff --git a/src/objdump/deps.mk b/src/objdump/deps.mk
@@ -1,3 +0,0 @@
-#deps
-objdump.o: $(INCDIR)/scc/scc/arg.h
-objdump.o: $(INCDIR)/scc/scc/mach.h