[klibc] [PATCH] ash not make -j safe, make spotless updates

[Olaf Hering]

 On Sat, Nov 29, Bryan O'Sullivan wrote:

> On Sat, 2003-11-29 at 04:42, Olaf Hering wrote:
> > here is a better patch.
> > It adds the kinit dependency, and another one to sh.shared.
> 
> These patches don't apply against CVS or BK head, presumably because of
> earlier patches you sent in.

This patch fits on the current bk.


diff -purN /fw/2/sources/kernel/klibc.bk/ash/Makefile klibc.bk/ash/Makefile
--- /fw/2/sources/kernel/klibc.bk/ash/Makefile	2003-11-29 06:17:07.000000000 +0000
+++ klibc.bk/ash/Makefile	2003-11-29 20:45:05.000000000 +0000
@@ -12,6 +12,9 @@ OBJ2 =	builtins.o cd.o dirent.o bltin/ec
 
 OBJS =	$(OBJ1) $(OBJ2)
 
+OBJ_NODES = cd.o eval.o exec.o expand.o jobs.o main.o nodes.o options.o parser.o redir.o show.o trap.o var.o
+
+
 SRCROOT  = ..
 include ../MCONFIG
 
@@ -35,7 +38,7 @@ $(PROG): $(OBJS) $(LIBS) $(CRT0)
 	$(LD) $(LDFLAGS) -o $(PROG) $(CRT0) $(OBJS) $(LIBS)
 	$(STRIP) $(PROG)
 
-$(PROG).shared: $(OBJS) $(LIBS)
+$(PROG).shared: $(OBJS) $(LIBS) $(KLIBSRC)/interp.o $(KLIBSRC)/libc.so
 	$(LD) $(LDFLAGS) -o $(PROG).shared -e main $(KLIBSRC)/interp.o $(OBJS) -R $(KLIBSRC)/libc.so $(LIBGCC)
 	$(STRIP) $(PROG).shared
 
@@ -63,6 +66,8 @@ init.c: mkinit $(SRCS)
 mkinit: mkinit.c
 	$(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) mkinit.c -o $@ $(HOST_LIBS)
 
+$(OBJ_NODES): nodes.h
+
 nodes.h: mknodes nodetypes nodes.c.pat
 	./mknodes nodetypes nodes.c.pat
 
@@ -73,7 +78,7 @@ mknodes: mknodes.c
 	$(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) mknodes.c -o $@ $(HOST_LIBS)
 
 clean:
-	rm -f core $(CLEANFILES) $(PROG) $(OBJS) .*.d
+	rm -f core $(CLEANFILES) $(PROG) $(PROG).shared $(OBJS) .*.d
 
 spotless: clean
 	find . -name \*~ -not -type d -print0 | xargs -0rt rm -f
diff -purN /fw/2/sources/kernel/klibc.bk/ipconfig/Makefile klibc.bk/ipconfig/Makefile
--- /fw/2/sources/kernel/klibc.bk/ipconfig/Makefile	2003-05-01 19:10:35.000000000 +0000
+++ klibc.bk/ipconfig/Makefile	2003-11-29 20:43:31.000000000 +0000
@@ -18,9 +18,9 @@ $(LIB): $(OBJS)
 	$(AR) cru $(LIB) $(OBJS)
 
 clean:
-	$(RM) *.o $(PROGS) core
+	$(RM) *.o $(PROG) $(LIB) core
 
-spotless:
+spotless: clean
 	$(RM) *~ .*.d
 
 ifneq ($(wildcard .*.d),)
diff -purN /fw/2/sources/kernel/klibc.bk/kinit/Makefile klibc.bk/kinit/Makefile
--- /fw/2/sources/kernel/klibc.bk/kinit/Makefile	2003-11-29 07:02:28.000000000 +0000
+++ klibc.bk/kinit/Makefile	2003-11-29 20:44:19.000000000 +0000
@@ -16,14 +16,14 @@ OBJS	= kinit.o do_mounts.o nfsroot.o
 
 all: $(PROGS)
 
-kinit: $(OBJS)
+kinit: $(OBJS) $(LIBS) $(CRT0)
 	$(LD) $(LDFLAGS) -o $@ $(CRT0) $(OBJS) $(LIBS)
 
 clean:
 	-rm -f *.o kinit
 
 spotless: clean
-	-rm -f .*.d
+	-rm -f .*.d *~
 
 ifneq ($(wildcard .*.d),)
 include $(wildcard .*.d)
diff -purN /fw/2/sources/kernel/klibc.bk/nfsmount/Makefile klibc.bk/nfsmount/Makefile
--- /fw/2/sources/kernel/klibc.bk/nfsmount/Makefile	2003-05-02 23:37:39.000000000 +0000
+++ klibc.bk/nfsmount/Makefile	2003-11-29 20:43:31.000000000 +0000
@@ -16,10 +16,10 @@ $(LIB): $(OBJS)
 	$(AR) cru $(LIB) $(OBJS)
 
 clean:
-	$(RM) *.o $(PROGS) core
+	$(RM) *.o $(PROG) $(LIB) core
 
-spotless:
-	$(RM) *~ .*.d
+spotless: clean
+	$(RM) *~ .*.d *~
 
 ifneq ($(wildcard .*.d),)
 include $(wildcard .*.d)

-- 
USB is for mice, FireWire is for men!

sUse lINUX ag, nÜRNBERG