From: Ben Gras <ben@minix3.org>
Date: Sun, 9 Apr 2006 23:16:13 +0000 (+0000)
Subject: Patches by Jeff Bailey for posixifications.
X-Git-Tag: v3.1.2a~38
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zlib_tech.html?a=commitdiff_plain;h=3172b4d0adba95c5017c6ee29ad45f098c7e0957;p=minix.git

Patches by Jeff Bailey for posixifications.
---

diff --git a/kernel/Makefile b/kernel/Makefile
index ca8a27cd1..d7ec1e9f2 100755
--- 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 18c67e867..0d74f20f5 100644
--- 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 ac8edb7a8..2b5537681 100755
--- 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