--- linux/lib/Makefile	2018/04/24 18:08:23	1.1.1.7
+++ linux/lib/Makefile	2018/04/24 18:11:57	1.1.1.9
@@ -6,24 +6,15 @@
 # unless it's something special (ie not a .c file).
 #
 
-AR	=ar
-AS	=as
-LD	=ld
-LDFLAGS	=-s -x
-CC	=gcc -nostdinc -I../include
-CPP	=gcc -E -nostdinc -I../include
-
 .c.s:
-	$(CC) $(CFLAGS) \
-	-S -o $*.s $<
+	$(CC) $(CFLAGS) -S $<
 .s.o:
 	$(AS) -c -o $*.o $<
 .c.o:
-	$(CC) $(CFLAGS) \
-	-c -o $*.o $<
+	$(CC) $(CFLAGS) -c $<
 
 OBJS  = ctype.o _exit.o open.o close.o errno.o write.o dup.o setsid.o \
-	execve.o wait.o string.o malloc.o itimer.o
+	execve.o wait.o string.o malloc.o
 
 lib.a: $(OBJS)
 	$(AR) rcs lib.a $(OBJS)
@@ -35,24 +26,24 @@ clean:
 
 dep:
 	sed '/\#\#\# Dependencies/q' < Makefile > tmp_make
-	(for i in *.c;do echo -n `echo $$i | sed 's,\.c,\.s,'`" "; \
-		$(CPP) -M $$i;done) >> tmp_make
+	for i in *.c;do $(CPP) -M $$i;done >> tmp_make
 	cp tmp_make Makefile
 
 ### Dependencies:
-_exit.s _exit.o : _exit.c ../include/linux/unistd.h 
-close.s close.o : close.c ../include/linux/unistd.h 
-ctype.s ctype.o : ctype.c ../include/linux/ctype.h 
-dup.s dup.o : dup.c ../include/linux/unistd.h 
-errno.s errno.o : errno.c 
-execve.s execve.o : execve.c ../include/linux/unistd.h 
-itimer.s itimer.o : itimer.c ../include/linux/unistd.h ../include/sys/time.h ../include/time.h \
-  ../include/sys/types.h 
-malloc.s malloc.o : malloc.c ../include/linux/kernel.h ../include/linux/mm.h ../include/linux/fs.h \
-  ../include/sys/types.h ../include/sys/dirent.h ../include/limits.h ../include/sys/vfs.h \
-  ../include/signal.h ../include/asm/system.h 
-open.s open.o : open.c ../include/linux/unistd.h ../include/stdarg.h 
-setsid.s setsid.o : setsid.c ../include/sys/types.h ../include/linux/unistd.h 
-string.s string.o : string.c ../include/linux/string.h 
-wait.s wait.o : wait.c ../include/linux/unistd.h ../include/sys/wait.h ../include/sys/types.h 
-write.s write.o : write.c ../include/linux/unistd.h ../include/sys/types.h 
+_exit.o : _exit.c /usr/src/linux/include/linux/unistd.h 
+close.o : close.c /usr/src/linux/include/linux/unistd.h 
+ctype.o : ctype.c /usr/src/linux/include/linux/ctype.h 
+dup.o : dup.c /usr/src/linux/include/linux/unistd.h 
+errno.o : errno.c 
+execve.o : execve.c /usr/src/linux/include/linux/unistd.h 
+malloc.o : malloc.c /usr/src/linux/include/linux/kernel.h /usr/src/linux/include/linux/mm.h \
+  /usr/src/linux/include/linux/fs.h /usr/src/linux/include/linux/limits.h /usr/src/linux/include/linux/wait.h \
+  /usr/src/linux/include/linux/types.h /usr/src/linux/include/linux/dirent.h /usr/src/linux/include/linux/vfs.h \
+  /usr/src/linux/include/linux/minix_fs_sb.h /usr/src/linux/include/linux/ext_fs_sb.h \
+  /usr/src/linux/include/linux/msdos_fs_sb.h /usr/src/linux/include/linux/signal.h \
+  /usr/src/linux/include/asm/system.h 
+open.o : open.c /usr/src/linux/include/linux/unistd.h /usr/src/linux/include/stdarg.h 
+setsid.o : setsid.c /usr/src/linux/include/linux/types.h /usr/src/linux/include/linux/unistd.h 
+string.o : string.c /usr/src/linux/include/linux/types.h /usr/src/linux/include/linux/string.h 
+wait.o : wait.c /usr/src/linux/include/linux/unistd.h /usr/src/linux/include/linux/types.h 
+write.o : write.c /usr/src/linux/include/linux/unistd.h /usr/src/linux/include/linux/types.h