[klibc] [PATCH] ash not make -j safe, make spotless updates
Olaf Hering
olh at suse.de
Sat Nov 29 13:42:39 PST 2003
here is a better patch.
It adds the kinit dependency, and another one to sh.shared.
diff -p -purNx linux klibc-0.87.orig/ash/Makefile klibc-0.87/ash/Makefile
--- klibc-0.87.orig/ash/Makefile 2003-02-10 12:05:21.000000000 +0100
+++ klibc-0.87/ash/Makefile 2003-11-29 13:31:33.000000000 +0100
@@ -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
@@ -31,11 +34,11 @@ CLEANFILES =\
all: $(PROG) $(PROG).shared
-$(PROG): $(OBJS) $(LIBS)
+$(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 -p -purNx linux klibc-0.87.orig/ipconfig/Makefile klibc-0.87/ipconfig/Makefile
--- klibc-0.87.orig/ipconfig/Makefile 2003-05-01 21:10:35.000000000 +0200
+++ klibc-0.87/ipconfig/Makefile 2003-11-29 13:20:53.000000000 +0100
@@ -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 -p -purNx linux klibc-0.87.orig/kinit/Makefile klibc-0.87/kinit/Makefile
--- klibc-0.87.orig/kinit/Makefile 2003-06-01 08:18:41.000000000 +0200
+++ klibc-0.87/kinit/Makefile 2003-11-29 13:28:24.000000000 +0100
@@ -16,8 +16,12 @@ OBJS := kinit.o do_mounts.o nfsroot.o
all: $(PROGS)
-kinit: $(OBJS)
+kinit: $(OBJS) $(LIBS) $(CRT0)
$(LD) $(LDFLAGS) -o $@ $(CRT0) $(OBJS) $(LIBS)
clean:
- -rm *.o kinit
+ -rm -f *.o kinit
+
+spotless: clean
+ -rm -f *~ .*.d
+
diff -p -purNx linux klibc-0.87.orig/nfsmount/Makefile klibc-0.87/nfsmount/Makefile
--- klibc-0.87.orig/nfsmount/Makefile 2003-05-03 01:37:39.000000000 +0200
+++ klibc-0.87/nfsmount/Makefile 2003-11-29 13:19:01.000000000 +0100
@@ -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
More information about the klibc
mailing list