Patches by Jeff Bailey for posixifications.

diff --git a/kernel/Makefile b/kernel/Makefile
index ca8a27cd135d645758b4e8bf0ba3f4addd04a4de..d7ec1e9f25a8c257c24a72f5ea80237c419cdeed 100755 (executable)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -37,6 +37,13 @@ depend:
        cd system && $(MAKE) -$(MAKEFLAGS) $@
        /usr/bin/mkdep "$(CC) -E $(CPPFLAGS)" *.c *.s > .depend
 
+# How to build it
+.s.o:
+       $(CC) $(CFLAGS) -c -o $@ $<
+
+.c.o:
+       $(CC) $(CFLAGS) -c -o $@ $<
+
 # Include generated dependencies.
 klib.o:        klib386.s klib88.s
 mpx.o: mpx386.s mpx88.s

diff --git a/lib/generate.sh b/lib/generate.sh
index 18c67e86775449eac08941749e230aae9287f418..0d74f20f538b45fc475fbd7d0d2be320de2329cf 100644 (file)
--- a/lib/generate.sh
+++ b/lib/generate.sh
@@ -63,12 +63,12 @@ if [ ! -z "$SUBDIRS" ]; then
        echo "$RECURSIVE_TARGETS:: makefiles"
        for dir in $SUBDIRS
        {
-               if [ $TYPE = "both" -o $TYPE = "ack" ]; then
+               #if [ $TYPE = "both" -o $TYPE = "ack" ]; then
                        #echo " mkdir -p $ACKBASE/$OBJDIR/$dir"
-               fi
-               if [ $TYPE = "both" -o $TYPE = "gnu" ]; then
+               #fi
+               #if [ $TYPE = "both" -o $TYPE = "gnu" ]; then
                        #echo " mkdir -p $GNUBASE/$OBJDIR/$dir"
-               fi
+               #fi
                
                echo "  cd $dir && \$(MAKE) \$@"
        }

diff --git a/tools/Makefile b/tools/Makefile
index ac8edb7a8c7a2acdee18dbf2155da6dd44046776..2b55376810682295df8a2e1853ca958c2796ae82 100755 (executable)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -4,7 +4,6 @@ u=/usr
 CC=    exec cc
 CFLAGS=        -O -D_MINIX -D_POSIX_SOURCE
 MDEC=  /usr/mdec
-MAKE=  exec make -$(MAKEFLAGS)
 
 # Specify the programs that are part of the system image.
 PROGRAMS=      ../kernel/kernel \
@@ -42,7 +41,7 @@ usage:
 
 # create a fresh configuration or system image
 fresh: 
-       cd ../lib && make clean
+       cd ../lib && $(MAKE) clean
        $(MAKE) clean 
        $(MAKE) libraries services
 
@@ -73,9 +72,9 @@ services: includes
        cd ../drivers && $(MAKE) install
 
 libraries: includes
-       cd ../lib && make clean
-       cd ../lib && make all
-       cd ../lib && make install
+       cd ../lib && $(MAKE) clean
+       cd ../lib && $(MAKE) all
+       cd ../lib && $(MAKE) install
 
 
 # make bootable and place system images