diff --git a/lib/.depend-ack b/lib/.depend-ack
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/.depend-gnu b/lib/.depend-gnu
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/Makedepend-ack b/lib/Makedepend-ack
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/Makedepend-gnu b/lib/Makedepend-gnu
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/Makefile b/lib/Makefile
deleted file mode 100755
index a67d0f45b..000000000
--- a/lib/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-
-ACKBASE=$(CURDIR)/obj-ack
-GNUBASE=$(CURDIR)/obj-gnu
-
-OBJDIR=.
-
-PATH:=$(PATH):/usr/gnu/bin
-
-SUBDIRS = ansi \
-	curses \
-	dummy \
-	editline \
-	end \
-	ip \
-	math \
-	other \
-	posix \
-	regex \
-	stdio \
-	syscall \
-	syslib \
-	util \
-	sysutil \
-	timers \
-	i386 \
-	zlib-1.2.3 \
-	ack \
-	gnu
-	
-
-include Makefile.inc
-
-install:: all
-	install -o bin $(ACKBASE)/*.[ao] /usr/lib/i386
-	install -o bin $(GNUBASE)/*.[ao] /usr/gnu/lib
diff --git a/lib/Makefile.ack.inc b/lib/Makefile.ack.inc
deleted file mode 100644
index c8fc63e95..000000000
--- a/lib/Makefile.ack.inc
+++ /dev/null
@@ -1,107 +0,0 @@
-#####
-##Top Makefile to build the Minix libraries for ack and gnu
-#
-##needed in makefile that includes this file:
-#
-##libraries to build without .a:
-#LIBRARIES=liba libb libc
-#
-##object files per library:
-#liba_OBJECTS=filea2.o filea2.o
-#libb_OBJECTS=fileb.o
-#libc_OBJECTS=filec.o
-#
-##if it has subdirectories
-#SUBDIRS=subdir1 subdir2
-#
-#
-##The main Makefile has to specify the ack and gnu base object directories:
-#ACKBASE=/path/to/ack-obj
-#GNUBASE=/path/to/gnu-obj
-##or relative in this way: 
-#ACKBASE=$(CURDIR)/ack-obj
-#GNUBASE=$(CURDIR)/gnu-obj
-#
-##All these variables have to be set before including this Makefile
-#
-#
-##To customize dependencies for targets you can do the following
-#$(call ADDDEPENDENCIES,filea2.o fileb.o,header1.h header2.h)
-#
-##And to customize MAKE variables for targets use the same construct this way
-#$(call ADDDEPENDENCIES,filea2.o fileb.o,CFLAGS+=-D_EXTRA_DEFINES -g)
-#
-##Only one variable can be set per call to ADDDEPENDENCIES
-#
-
-##Object files that must end up in the top level object directory must be in
-##then variable named TOPLEVEL_OBJECTS
-
-
-ifndef ACKBASE
-$(error ACKBASE not set)
-endif
-
-.PHONY: all 
-all:: \
-	$(addsuffix .a,$(addprefix $(ACKBASE)/,$(LIBRARIES))) \
-	$(addprefix $(ACKBASE)/,$(TOPLEVEL_OBJECTS)) \
-	subdirs
-
-.PHONY: clean
-clean:: subdirs
-	rm -fr $(ACKBASE)/$(OBJDIR)
-
-#Start objects
-define TOPLEVEL_template
-$$(addprefix $$(ACKBASE)/,$(1)): $$(addprefix $$(ACKBASE)/$$(OBJDIR)/,$(1))
-	cp $$? $$@
-endef
-
-$(foreach obj,$(TOPLEVEL_OBJECTS),$(eval $(call TOPLEVEL_template,$(obj))))
-
-#Library stuff
-define LIBRARY_template
-$$(ACKBASE)/$(1).a: $$(addprefix $$(ACKBASE)/$$(OBJDIR)/,$$($(1)_OBJECTS))
-	$$(AR) cr $$@ $$?
-endef
-
-$(foreach lib,$(LIBRARIES),$(eval $(call LIBRARY_template,$(lib))))
-
-#subdirectories
-.PHONY: subdirs $(SUBDIRS)
-subdirs: $(SUBDIRS)
-$(SUBDIRS):
-	mkdir -p $(ACKBASE)/$(OBJDIR)/$@
-	ACKBASE=$(ACKBASE) OBJDIR=$(OBJDIR)/$@ $(MAKE) -C $@ $(MAKECMDGOALS)
-
-#Build commands
-#define COMPILE_template
-$(ACKBASE)/%: AR=ar
-$(ACKBASE)/%: AS=cc -c
-$(ACKBASE)/%: CC=cc
-$(ACKBASE)/%: M2C=m2 -c
-
-$(ACKBASE)/$(OBJDIR)/%.o: %.s
-	$(COMPILE.s) -o $@ $<
-
-$(ACKBASE)/$(OBJDIR)/%.o: %.c
-	$(COMPILE.c) -o $@ $<
-
-$(ACKBASE)/$(OBJDIR)/%.o: %.e
-	$(COMPILE.c) -o $@ $<
-
-$(ACKBASE)/$(OBJDIR)/%.o: %.mod
-	$(COMPILE.mod) -o $@ $<
-#endef
-
-#$(eval $(call COMPILE_template,$$(ACKBASE),s,ar,cc -c,cc,m2))
-
-#DEPENDENCIES
-define DEPENDENCIES_template
-$$(ACKBASE)/$$(OBJDIR)/$(1): $(2)
-endef
-
-define ADDDEPENDENCIES
-$(foreach target,$(1),$(eval $(call DEPENDENCIES_template,$(target),$(2))))
-endef
diff --git a/lib/Makefile.gnu.inc b/lib/Makefile.gnu.inc
deleted file mode 100644
index f32c1fec4..000000000
--- a/lib/Makefile.gnu.inc
+++ /dev/null
@@ -1,108 +0,0 @@
-#####
-##Top Makefile to build the Minix libraries for ack and gnu
-#
-##needed in makefile that includes this file:
-#
-##libraries to build without .a:
-#LIBRARIES=liba libb libc
-#
-##object files per library:
-#liba_OBJECTS=filea2.o filea2.o
-#libb_OBJECTS=fileb.o
-#libc_OBJECTS=filec.o
-#
-##if it has subdirectories
-#SUBDIRS=subdir1 subdir2
-#
-#
-##The main Makefile has to specify the ack and gnu base object directories:
-#ACKBASE=/path/to/ack-obj
-#GNUBASE=/path/to/gnu-obj
-##or relative in this way: 
-#ACKBASE=$(CURDIR)/ack-obj
-#GNUBASE=$(CURDIR)/gnu-obj
-#
-##All these variables have to be set before including this Makefile
-#
-#
-##To customize dependencies for targets you can do the following
-#$(call ADDDEPENDENCIES,filea2.o fileb.o,header1.h header2.h)
-#
-##And to customize MAKE variables for targets use the same construct this way
-#$(call ADDDEPENDENCIES,filea2.o fileb.o,CFLAGS+=-D_EXTRA_DEFINES -g)
-#
-##Only one variable can be set per call to ADDDEPENDENCIES
-#
-
-##Object files that must end up in the top level object directory must be in
-##then variable named TOPLEVEL_OBJECTS
-
-
-ifndef GNUBASE
-$(error GNUBASE not set)
-endif
-
-.PHONY: all 
-all:: $(addsuffix .a, \
-	$(addprefix $(GNUBASE)/,$(LIBRARIES))) \
-	$(addprefix $(GNUBASE)/,$(TOPLEVEL_OBJECTS)) \
-	subdirs
-
-.PHONY: clean
-clean:: subdirs
-	rm -rf $(GNUBASE)/$(OBJDIR)
-
-#Start objects
-define TOPLEVEL_template
-$$(addprefix $$(GNUBASE)/,$(1)): $$(addprefix $$(GNUBASE)/$$(OBJDIR)/,$(1))
-	cp $$? $$@
-endef
-
-$(foreach obj,$(TOPLEVEL_OBJECTS),$(eval $(call TOPLEVEL_template,$(obj))))
-
-#Library stuff
-define LIBRARY_template
-$$(GNUBASE)/$(1).a: $$(addprefix $$(GNUBASE)/$$(OBJDIR)/,$$($(1)_OBJECTS))
-	$$(AR) cr $$@ $$?
-	ranlib $$@
-endef
-
-$(foreach lib,$(LIBRARIES),$(eval $(call LIBRARY_template,$(lib))))
-
-#subdirectories
-.PHONY: subdirs $(SUBDIRS)
-subdirs: $(SUBDIRS)
-$(SUBDIRS):
-	if [ ! -d $(GNUBASE)/$(OBJDIR)/$@ ]; \
-	then \
-		mkdir $(GNUBASE)/$(OBJDIR)/$@; \
-	fi
-	GNUBASE=$(GNUBASE) OBJDIR=$(OBJDIR)/$@ $(MAKE) -C $@ $(MAKECMDGOALS)
-
-#Build commands
-#define COMPILE_template
-$(GNUBASE)/%: AR=gar
-$(GNUBASE)/%: AS=gas
-$(GNUBASE)/%: CC=gcc
-
-$(GNUBASE)/$(OBJDIR)/%.o: %.gs
-	$(COMPILE.s) -o $@ $<
-
-$(GNUBASE)/$(OBJDIR)/%.o: %.c
-	$(COMPILE.c) -o $@ $<
-#endef
-
-#$(eval $(call COMPILE_template,$$(GNUBASE),gs,gar,gas,gcc))
-
-%.gs: %.s
-	@echo converting $< to gnu assembler format...
-	@-gcc $(CFLAGS) -E -x assembler-with-cpp -I. $< | asmconv -mi386 ack gnu > $@
-
-#DEPENDENCIES
-define DEPENDENCIES_template
-$$(GNUBASE)/$$(OBJDIR)/$(1): $(2)
-endef
-
-define ADDDEPENDENCIES
-$(foreach target,$(1),$(eval $(call DEPENDENCIES_template,$(target),$(2))))
-endef
diff --git a/lib/Makefile.in b/lib/Makefile.in
new file mode 100644
index 000000000..fdeb121a7
--- /dev/null
+++ b/lib/Makefile.in
@@ -0,0 +1,28 @@
+
+#ACKBASE=$(CURDIR)/obj-ack
+#GNUBASE=$(CURDIR)/obj-gnu
+
+#OBJDIR=.
+
+SUBDIRS="ansi \
+	curses \
+	dummy \
+	editline \
+	end \
+	ip \
+	math \
+	other \
+	posix \
+	regex \
+	stdio \
+	syscall \
+	syslib \
+	util \
+	sysutil \
+	timers \
+	i386 \
+	zlib-1.2.3 \
+	ack
+	gnu"
+	
+TYPE=both
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
deleted file mode 100644
index 5e9426ccb..000000000
--- a/lib/Makefile.inc
+++ /dev/null
@@ -1,153 +0,0 @@
-#####
-##Top Makefile to build the Minix libraries for ack and gnu
-#
-##needed in makefile that includes this file:
-#
-##libraries to build without .a:
-#LIBRARIES=liba libb libc
-#
-##object files per library:
-#liba_OBJECTS=filea2.o filea2.o
-#libb_OBJECTS=fileb.o
-#libc_OBJECTS=filec.o
-#
-##if it has subdirectories
-#SUBDIRS=subdir1 subdir2
-#
-#
-##The main Makefile has to specify the ack and gnu base object directories:
-#ACKBASE=/path/to/ack-obj
-#GNUBASE=/path/to/gnu-obj
-##or relative in this way: 
-#ACKBASE=$(CURDIR)/ack-obj
-#GNUBASE=$(CURDIR)/gnu-obj
-#
-##All these variables have to be set before including this Makefile
-#
-#
-##To customize dependencies for targets you can do the following
-#$(call ADDDEPENDENCIES,filea2.o fileb.o,header1.h header2.h)
-#
-##And to customize MAKE variables for targets use the same construct this way
-#$(call ADDDEPENDENCIES,filea2.o fileb.o,CFLAGS+=-D_EXTRA_DEFINES -g)
-#
-##Only one variable can be set per call to ADDDEPENDENCIES
-#
-
-##Object files that must end up in the top level object directory must be in
-##then variable named TOPLEVEL_OBJECTS
-
-ifndef ACKBASE
-$(error ACKBASE not set)
-endif
-
-ifndef GNUBASE
-$(error GNUBASE not set)
-endif
-
-.PHONY: all 
-all:: $(addsuffix .a, \
-	$(addprefix $(ACKBASE)/,$(LIBRARIES)) \
-	$(addprefix $(GNUBASE)/,$(LIBRARIES))) \
-	$(addprefix $(ACKBASE)/,$(TOPLEVEL_OBJECTS)) \
-	$(addprefix $(GNUBASE)/,$(TOPLEVEL_OBJECTS)) \
-	subdirs
-
-.PHONY: clean
-clean:: subdirs
-	rm -rf $(ACKBASE)/$(OBJDIR) $(GNUBASE)/$(OBJDIR)
-
-.PHONY: install
-install::
-
-#Start objects
-define TOPLEVEL_template
-$$(addprefix $$(ACKBASE)/,$(1)): $$(addprefix $$(ACKBASE)/$$(OBJDIR)/,$(1))
-	cp $$? $$@
-$$(addprefix $$(GNUBASE)/,$(1)): $$(addprefix $$(GNUBASE)/$$(OBJDIR)/,$(1))
-	cp $$? $$@
-endef
-
-$(foreach obj,$(TOPLEVEL_OBJECTS),$(eval $(call TOPLEVEL_template,$(obj))))
-
-#Library stuff
-define LIBRARY_template
-$$(ACKBASE)/$(1).a: $$(addprefix $$(ACKBASE)/$$(OBJDIR)/,$$($(1)_OBJECTS))
-	$$(AR) cr $$@ $$?
-
-$$(GNUBASE)/$(1).a: $$(addprefix $$(GNUBASE)/$$(OBJDIR)/,$$($(1)_OBJECTS))
-	$$(AR) cr $$@ $$?
-	ranlib $$@
-endef
-
-$(foreach lib,$(LIBRARIES),$(eval $(call LIBRARY_template,$(lib))))
-
-#subdirectories
-.PHONY: subdirs $(SUBDIRS)
-subdirs: $(SUBDIRS)
-$(SUBDIRS):
-	mkdir -p $(ACKBASE)/$(OBJDIR)/$@
-	mkdir -p $(GNUBASE)/$(OBJDIR)/$@
-	ACKBASE=$(ACKBASE) GNUBASE=$(GNUBASE) OBJDIR=$(OBJDIR)/$@ $(MAKE) -C $@ $(MAKECMDGOALS)
-#	$(call compiledir-ack,$@)
-#	$(call compiledir-gnu,$@)
-
-#ack vs gnu
-define compiledir_ack
-	mkdir -p $(ack_OBJDIR)/$(OBJDIR)/$(1)
-	cd $(1) && OBJDIR=$(OBJDIR)/$(1) AR=ar AS='cc -c' CC=cc RANLIB= ASMEXT=s gmake $@ $(MAKECMDGOALS)
-endef
-
-define compiledir_gnu
-	mkdir -p $(gnu_OBJDIR)/$(OBJDIR)/$(1)
-	cd $(1) && OBJDIR=$(OBJDIR)/$(1) AR=gar AS=gas CC=gcc RANLIB=ranlib ASMEXT=gs gmake $@ $(MAKECMDGOALS)
-endef
-
-#Build commands
-#$(GNUBASE)/$(OBJDIR)/%: AR=gar AS=gas CC=gcc RANLIB=ranlib ASMEXT=gs ASMPREFIX=$(GNUBASE)/$(OBJDIR)
-#$(ACKBASE)/$(OBJDIR)/%: AR=ar AS='cc -c' CC=cc RANLIB= ASMEXT=s
-
-#$(1)/$$(OBJDIR)/%.o: $(3)
-define COMPILE_template
-$(1)/%: AR=$(3)
-$(1)/%: AS=$(4)
-$(1)/%: CC=$(5)
-
-$(1)/$$(OBJDIR)/%.o: %.$(2)
-	$$(COMPILE.s) -o $$@ $$<
-
-$(1)/$$(OBJDIR)/%.o: %.c
-	$$(COMPILE.c) -o $$@ $$<
-endef
-
-#ASMPREFIX?
-#$(1)/$$(OBJDIR)/%.o: $(2)%.$(3)
-#	$$(COMPILE.s) -o $$@ $$<
-#$(eval $(call COMPILE_template,$$(ACKBASE),,s,ar,cc -c,cc))
-#$(eval $(call COMPILE_template,$$(GNUBASE),$$(GNUBASE)/$$(OBJDIR)/,gs,gar,gas,gcc))
-#$(GNUBASE)/$(OBJDIR)/%.gs: %.s
-
-#$(GNUBASE)/$(OBJDIR)/%.o: $(GNUBASE)/$(OBJDIR)/%.gs
-#	$(COMPILE.s) -o $@ $<
-
-#$(GNUBASE)/$(OBJDIR)/%.o: %.c
-#	$(COMPILE.c) -o $@ $<
-
-$(eval $(call COMPILE_template,$$(ACKBASE),s,ar,cc -c,cc))
-$(eval $(call COMPILE_template,$$(GNUBASE),gs,gar,gas,gcc))
-
-%.gs: %.s
-	@echo converting $< to gnu assembler format...
-	@-gcc $(CFLAGS) -E -x assembler-with-cpp -I. $< | asmconv -mi386 ack gnu > $@
-
-#DEPENDENCIES
-define DEPENDENCIES_template
-$$(ACKBASE)/$$(OBJDIR)/$(1): $(2)
-$$(GNUBASE)/$$(OBJDIR)/$(1): $(2)
-endef
-
-define ADDDEPENDENCIES
-$(foreach target,$(1),$(eval $(call DEPENDENCIES_template,$(target),$(2))))
-endef
-
-#this could also be automated by adding an extra template that uses the names of object files as variable name
diff --git a/lib/README b/lib/README
index bb2b0bc18..466ca8c07 100644
--- a/lib/README
+++ b/lib/README
@@ -1,2 +1,7 @@
-Libraries are compiled for both ack and gcc. If you want to compile them
-for ack only (gcc takes up a lot of memory), please see ackonly/README.
+make depend  - find dependencies of ack libraries
+make all     - compile ack libraries
+make install - compile and install ack libraries
+
+make depend-gnu  - find dependencies of gnu libraries
+make all-gnu     - compile gnu libraries
+make install-gnu - compile and install gnu libraries
diff --git a/lib/ack/Makefile.ack b/lib/ack/Makefile.ack
deleted file mode 100644
index f26c4657b..000000000
--- a/lib/ack/Makefile.ack
+++ /dev/null
@@ -1,11 +0,0 @@
-
-all:
-	cd float && make
-	cd fphook && make
-	cd `arch` && make
-	cd libm2 && make
-	cd libp && make
-	cd liby && make
-	cd math && make
-	cd rts && make
-
diff --git a/lib/ack/Makefile b/lib/ack/Makefile.in
similarity index 59%
rename from lib/ack/Makefile
rename to lib/ack/Makefile.in
index 9ddb4776a..7987b479b 100644
--- a/lib/ack/Makefile
+++ b/lib/ack/Makefile.in
@@ -1,5 +1,5 @@
 
-SUBDIRS = \
+SUBDIRS=" \
 	float \
 	fphook \
 	i386 \
@@ -7,6 +7,6 @@ SUBDIRS = \
 	libp \
 	liby \
 	math \
-	rts \
+	rts"
 
-include ../Makefile.inc
+TYPE=ack
diff --git a/lib/ack/float/FP.compile b/lib/ack/float/FP.compile
index 3ca814d8a..f0868f073 100755
--- a/lib/ack/float/FP.compile
+++ b/lib/ack/float/FP.compile
@@ -5,15 +5,18 @@
 # only optimizes scratch register allocation a bit with -O.  To the 32-bit
 # compiler -O is a no-op.)
 
-case $#:$1 in
-1:*.fc)	;;
+case $#:$2 in
+2:*.fc)	;;
 *)	echo "$0: $1: not a FC file" >&2; exit 1
 esac
 
-base="`basename "$1" .fc`"
+dst=$1
+src=$2
+base="`basename "$src" .fc`"
 trap 'rm -f tmp.c tmp.s"; exit 1' 2
 
-cp "$1" tmp.c &&
+cp "$src" tmp.c &&
 cc -O -I. -D_MINIX -D_POSIX_SOURCE -S tmp.c &&
 sed -f FP.script tmp.s > "$base.s" &&
+cc -c -o $dst "$base.s" &&
 rm tmp.c tmp.s
diff --git a/lib/ack/float/Makefile b/lib/ack/float/Makefile
deleted file mode 100644
index 7b2715c0b..000000000
--- a/lib/ack/float/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# Makefile for lib/float.
-
-CC1	= /bin/sh ./FP.compile
-
-LIBRARIES = libfp
-
-libfp_OBJECTS	= \
-	add_ext.o \
-	adder.o \
-	adf4.o \
-	adf8.o \
-	cff4.o \
-	cff8.o \
-	cfi.o \
-	cfu.o \
-	cif4.o \
-	cif8.o \
-	cmf4.o \
-	cmf8.o \
-	compact.o \
-	cuf4.o \
-	cuf8.o \
-	div_ext.o \
-	dvf4.o \
-	dvf8.o \
-	extend.o \
-	fef4.o \
-	fef8.o \
-	fif4.o \
-	fif8.o \
-	fptrp.o \
-	mlf4.o \
-	mlf8.o \
-	mul_ext.o \
-	ngf4.o \
-	ngf8.o \
-	nrm_ext.o \
-	sbf4.o \
-	sbf8.o \
-	sft_ext.o \
-	shifter.o \
-	sub_ext.o \
-	zrf4.o \
-	zrf8.o \
-	zrf_ext.o \
-
-include ../../Makefile.ack.inc
-
-#extra commands to convert the c files to the correct assembler files
-
-%.s: %.fc
-	/bin/sh ./FP.compile $<
-
-#1. make a assembler file of the c file
-#%.fs: %.fc
-#	-cp $< $(<:.fc=.c) && cc -O -I. -D_MINIX -D_POSIX_SOURCE -S $(<:.fc=.c) && cp $(<:.fc=.s) $(<:.fc=.fs)
-#	@rm $(<:.fc=.c) $(<:.fc=.s)
-
-#2. modify the assembler file
-#%.s: %.fs
-#	sed -f FP.script $< > $@
diff --git a/lib/ack/float/Makefile.in b/lib/ack/float/Makefile.in
new file mode 100644
index 000000000..589e03f95
--- /dev/null
+++ b/lib/ack/float/Makefile.in
@@ -0,0 +1,61 @@
+# Makefile for lib/float.
+
+#CC1	= /bin/sh ./FP.compile
+
+LIBRARIES=libfp
+
+libfp_FILES=" \
+	add_ext.fc \
+	adder.fc \
+	adf4.fc \
+	adf8.fc \
+	cff4.fc \
+	cff8.fc \
+	cfi.fc \
+	cfu.fc \
+	cif4.fc \
+	cif8.fc \
+	cmf4.fc \
+	cmf8.fc \
+	compact.fc \
+	cuf4.fc \
+	cuf8.fc \
+	div_ext.fc \
+	dvf4.fc \
+	dvf8.fc \
+	extend.fc \
+	fef4.fc \
+	fef8.fc \
+	fif4.fc \
+	fif8.fc \
+	fptrp.s \
+	mlf4.fc \
+	mlf8.fc \
+	mul_ext.fc \
+	ngf4.fc \
+	ngf8.fc \
+	nrm_ext.fc \
+	sbf4.fc \
+	sbf8.fc \
+	sft_ext.fc \
+	shifter.fc \
+	sub_ext.fc \
+	zrf4.fc \
+	zrf8.fc \
+	zrf_ext.fc"
+
+TYPE=ack
+
+#extra commands to convert the c files to the correct assembler files
+
+#%.s: %.fc
+#	/bin/sh ./FP.compile $<
+
+#1. make a assembler file of the c file
+#%.fs: %.fc
+#	-cp $< $(<:.fc=.c) && cc -O -I. -D_MINIX -D_POSIX_SOURCE -S $(<:.fc=.c) && cp $(<:.fc=.s) $(<:.fc=.fs)
+#	@rm $(<:.fc=.c) $(<:.fc=.s)
+
+#2. modify the assembler file
+#%.s: %.fs
+#	sed -f FP.script $< > $@
diff --git a/lib/ack/fphook/Makefile.ack.conv b/lib/ack/fphook/Makefile.ack.conv
deleted file mode 100755
index 765313be6..000000000
--- a/lib/ack/fphook/Makefile.ack.conv
+++ /dev/null
@@ -1,32 +0,0 @@
-# Makefile for lib/i86/fphook.
-
-# The ACK ANSI C compiler has an nice trick to reduce the size of programs
-# that do not use floating point.  If a program uses floating point then the
-# compiler generates an external reference to the label '_fp_hook'.  This makes
-# the loader bring in the floating point printing and conversion routines
-# '_f_print' and 'strtod' from the library libd.a.  Otherwise two dummy
-# routines are found in libc.a.  (The printf and scanf need floating point
-# for the %f formats, whether you use them or not.)
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE
-CC1	= $(CC) $(CFLAGS) -c -I$(SRCDIR)/ack
-
-LIBD	= ../../libd.a
-LIBC	= ../../libc.a
-
-all:	$(LIBD) $(LIBC)
-
-$(LIBD):	fphook.c
-	$(CC1) fphook.c
-	aal cr $@ fphook.o
-	rm fphook.o
-
-$(LIBC):	$(LIBC)(fltpr.o) $(LIBC)(strtod.o)
-	aal cr $@ *.o
-	rm *.o
-
-$(LIBC)(fltpr.o): fltpr.c
-	$(CC1) fltpr.c
-
-$(LIBC)(strtod.o): strtod.c
-	$(CC1) strtod.c
diff --git a/lib/ack/fphook/Makefile b/lib/ack/fphook/Makefile.in
similarity index 78%
rename from lib/ack/fphook/Makefile
rename to lib/ack/fphook/Makefile.in
index 29f0d98e1..61eb65417 100644
--- a/lib/ack/fphook/Makefile
+++ b/lib/ack/fphook/Makefile.in
@@ -8,12 +8,12 @@
 # routines are found in libc.a.  (The printf and scanf need floating point
 # for the %f formats, whether you use them or not.)
 
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE -I..
+CFLAGS="-O -D_MINIX -D_POSIX_SOURCE -I.."
 
-LIBRARIES = libd libc
+LIBRARIES="libd libc"
 
-libd_OBJECTS = fphook.o
+libd_FILES=fphook.c
 
-libc_OBJECTS = fltpr.o strtod.o
+libc_FILES="fltpr.c strtod.c"
 
-include ../../Makefile.ack.inc
+TYPE=ack
diff --git a/lib/ack/i386/Makefile b/lib/ack/i386/Makefile
deleted file mode 100644
index b13ca13cf..000000000
--- a/lib/ack/i386/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-
-SUBDIRS = em head
-
-include ../../Makefile.ack.inc
diff --git a/lib/ack/i386/Makefile.ack b/lib/ack/i386/Makefile.ack
deleted file mode 100644
index e9a936902..000000000
--- a/lib/ack/i386/Makefile.ack
+++ /dev/null
@@ -1,5 +0,0 @@
-
-all:
-	cd em && make
-	cd head && make
-
diff --git a/lib/ack/i386/Makefile.in b/lib/ack/i386/Makefile.in
new file mode 100644
index 000000000..92350c337
--- /dev/null
+++ b/lib/ack/i386/Makefile.in
@@ -0,0 +1,4 @@
+
+SUBDIRS="em head"
+
+TYPE=ack
diff --git a/lib/ack/i386/em/Makefile b/lib/ack/i386/em/Makefile
deleted file mode 100644
index 33f335c7f..000000000
--- a/lib/ack/i386/em/Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
-# Makefile for lib/ack/i386/em.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE -Was-ack
-
-LIBRARIES = libe
-
-libe_OBJECTS	= \
-	em_adf4.o \
-	em_adf8.o \
-	em_adi.o \
-	em_and.o \
-	em_blm.o \
-	em_cff4.o \
-	em_cff8.o \
-	em_cfi.o \
-	em_cfu.o \
-	em_cif4.o \
-	em_cif8.o \
-	em_cii.o \
-	em_cmf4.o \
-	em_cmf8.o \
-	em_cms.o \
-	em_com.o \
-	em_csa4.o \
-	em_csb4.o \
-	em_cuf4.o \
-	em_cuf8.o \
-	em_cuu.o \
-	em_dup.o \
-	em_dvf4.o \
-	em_dvf8.o \
-	em_dvi.o \
-	em_dvu.o \
-	em_error.o \
-	em_exg.o \
-	em_fat.o \
-	em_fef4.o \
-	em_fef8.o \
-	em_fif4.o \
-	em_fif8.o \
-	em_fp8087.o \
-	em_gto.o \
-	em_hol0.o \
-	em_iaar.o \
-	em_ilar.o \
-	em_inn.o \
-	em_ior.o \
-	em_isar.o \
-	em_lar4.o \
-	em_loi.o \
-	em_mlf4.o \
-	em_mlf8.o \
-	em_mli.o \
-	em_mon.o \
-	em_ngf4.o \
-	em_ngf8.o \
-	em_ngi.o \
-	em_nop.o \
-	em_print.o \
-	em_rck.o \
-	em_rmi.o \
-	em_rmu.o \
-	em_rol.o \
-	em_ror.o \
-	em_sar4.o \
-	em_sbf4.o \
-	em_sbf8.o \
-	em_sbi.o \
-	em_set.o \
-	em_sli.o \
-	em_sri.o \
-	em_sti.o \
-	em_stop.o \
-	em_trp.o \
-	em_unknown.o \
-	em_xor.o \
-
-include ../../../Makefile.ack.inc
diff --git a/lib/ack/i386/em/Makefile.ack.conv b/lib/ack/i386/em/Makefile.ack.conv
deleted file mode 100755
index 86b2cac31..000000000
--- a/lib/ack/i386/em/Makefile.ack.conv
+++ /dev/null
@@ -1,289 +0,0 @@
-# Makefile for lib/i386/em.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE -Was-ack
-CC1	= $(CC) $(CFLAGS) -c
-
-LIBRARY	= ../../../libe.a
-all:	$(LIBRARY)
-
-OBJECTS	= \
-	$(LIBRARY)(em_adf4.o) \
-	$(LIBRARY)(em_adf8.o) \
-	$(LIBRARY)(em_adi.o) \
-	$(LIBRARY)(em_and.o) \
-	$(LIBRARY)(em_blm.o) \
-	$(LIBRARY)(em_cff4.o) \
-	$(LIBRARY)(em_cff8.o) \
-	$(LIBRARY)(em_cfi.o) \
-	$(LIBRARY)(em_cfu.o) \
-	$(LIBRARY)(em_cif4.o) \
-	$(LIBRARY)(em_cif8.o) \
-	$(LIBRARY)(em_cii.o) \
-	$(LIBRARY)(em_cmf4.o) \
-	$(LIBRARY)(em_cmf8.o) \
-	$(LIBRARY)(em_cms.o) \
-	$(LIBRARY)(em_com.o) \
-	$(LIBRARY)(em_csa4.o) \
-	$(LIBRARY)(em_csb4.o) \
-	$(LIBRARY)(em_cuf4.o) \
-	$(LIBRARY)(em_cuf8.o) \
-	$(LIBRARY)(em_cuu.o) \
-	$(LIBRARY)(em_dup.o) \
-	$(LIBRARY)(em_dvf4.o) \
-	$(LIBRARY)(em_dvf8.o) \
-	$(LIBRARY)(em_dvi.o) \
-	$(LIBRARY)(em_dvu.o) \
-	$(LIBRARY)(em_error.o) \
-	$(LIBRARY)(em_exg.o) \
-	$(LIBRARY)(em_fat.o) \
-	$(LIBRARY)(em_fef4.o) \
-	$(LIBRARY)(em_fef8.o) \
-	$(LIBRARY)(em_fif4.o) \
-	$(LIBRARY)(em_fif8.o) \
-	$(LIBRARY)(em_fp8087.o) \
-	$(LIBRARY)(em_gto.o) \
-	$(LIBRARY)(em_hol0.o) \
-	$(LIBRARY)(em_iaar.o) \
-	$(LIBRARY)(em_ilar.o) \
-	$(LIBRARY)(em_inn.o) \
-	$(LIBRARY)(em_ior.o) \
-	$(LIBRARY)(em_isar.o) \
-	$(LIBRARY)(em_lar4.o) \
-	$(LIBRARY)(em_loi.o) \
-	$(LIBRARY)(em_mlf4.o) \
-	$(LIBRARY)(em_mlf8.o) \
-	$(LIBRARY)(em_mli.o) \
-	$(LIBRARY)(em_mon.o) \
-	$(LIBRARY)(em_ngf4.o) \
-	$(LIBRARY)(em_ngf8.o) \
-	$(LIBRARY)(em_ngi.o) \
-	$(LIBRARY)(em_nop.o) \
-	$(LIBRARY)(em_print.o) \
-	$(LIBRARY)(em_rck.o) \
-	$(LIBRARY)(em_rmi.o) \
-	$(LIBRARY)(em_rmu.o) \
-	$(LIBRARY)(em_rol.o) \
-	$(LIBRARY)(em_ror.o) \
-	$(LIBRARY)(em_sar4.o) \
-	$(LIBRARY)(em_sbf4.o) \
-	$(LIBRARY)(em_sbf8.o) \
-	$(LIBRARY)(em_sbi.o) \
-	$(LIBRARY)(em_set.o) \
-	$(LIBRARY)(em_sli.o) \
-	$(LIBRARY)(em_sri.o) \
-	$(LIBRARY)(em_sti.o) \
-	$(LIBRARY)(em_stop.o) \
-	$(LIBRARY)(em_trp.o) \
-	$(LIBRARY)(em_unknown.o) \
-	$(LIBRARY)(em_xor.o) \
-
-$(LIBRARY):	$(OBJECTS)
-	aal cr $@ *.o
-	rm *.o
-
-$(LIBRARY)(em_adf4.o):	em_adf4.s
-	$(CC1) em_adf4.s
-
-$(LIBRARY)(em_adf8.o):	em_adf8.s
-	$(CC1) em_adf8.s
-
-$(LIBRARY)(em_adi.o):	em_adi.s
-	$(CC1) em_adi.s
-
-$(LIBRARY)(em_and.o):	em_and.s
-	$(CC1) em_and.s
-
-$(LIBRARY)(em_blm.o):	em_blm.s
-	$(CC1) em_blm.s
-
-$(LIBRARY)(em_cff4.o):	em_cff4.s
-	$(CC1) em_cff4.s
-
-$(LIBRARY)(em_cff8.o):	em_cff8.s
-	$(CC1) em_cff8.s
-
-$(LIBRARY)(em_cfi.o):	em_cfi.s
-	$(CC1) em_cfi.s
-
-$(LIBRARY)(em_cfu.o):	em_cfu.s
-	$(CC1) em_cfu.s
-
-$(LIBRARY)(em_cif4.o):	em_cif4.s
-	$(CC1) em_cif4.s
-
-$(LIBRARY)(em_cif8.o):	em_cif8.s
-	$(CC1) em_cif8.s
-
-$(LIBRARY)(em_cii.o):	em_cii.s
-	$(CC1) em_cii.s
-
-$(LIBRARY)(em_cmf4.o):	em_cmf4.s
-	$(CC1) em_cmf4.s
-
-$(LIBRARY)(em_cmf8.o):	em_cmf8.s
-	$(CC1) em_cmf8.s
-
-$(LIBRARY)(em_cms.o):	em_cms.s
-	$(CC1) em_cms.s
-
-$(LIBRARY)(em_com.o):	em_com.s
-	$(CC1) em_com.s
-
-$(LIBRARY)(em_csa4.o):	em_csa4.s
-	$(CC1) em_csa4.s
-
-$(LIBRARY)(em_csb4.o):	em_csb4.s
-	$(CC1) em_csb4.s
-
-$(LIBRARY)(em_cuf4.o):	em_cuf4.s
-	$(CC1) em_cuf4.s
-
-$(LIBRARY)(em_cuf8.o):	em_cuf8.s
-	$(CC1) em_cuf8.s
-
-$(LIBRARY)(em_cuu.o):	em_cuu.s
-	$(CC1) em_cuu.s
-
-$(LIBRARY)(em_dup.o):	em_dup.s
-	$(CC1) em_dup.s
-
-$(LIBRARY)(em_dvf4.o):	em_dvf4.s
-	$(CC1) em_dvf4.s
-
-$(LIBRARY)(em_dvf8.o):	em_dvf8.s
-	$(CC1) em_dvf8.s
-
-$(LIBRARY)(em_dvi.o):	em_dvi.s
-	$(CC1) em_dvi.s
-
-$(LIBRARY)(em_dvu.o):	em_dvu.s
-	$(CC1) em_dvu.s
-
-$(LIBRARY)(em_error.o):	em_error.s
-	$(CC1) em_error.s
-
-$(LIBRARY)(em_exg.o):	em_exg.s
-	$(CC1) em_exg.s
-
-$(LIBRARY)(em_fat.o):	em_fat.s
-	$(CC1) em_fat.s
-
-$(LIBRARY)(em_fef4.o):	em_fef4.s
-	$(CC1) em_fef4.s
-
-$(LIBRARY)(em_fef8.o):	em_fef8.s
-	$(CC1) em_fef8.s
-
-$(LIBRARY)(em_fif4.o):	em_fif4.s
-	$(CC1) em_fif4.s
-
-$(LIBRARY)(em_fif8.o):	em_fif8.s
-	$(CC1) em_fif8.s
-
-$(LIBRARY)(em_fp8087.o):	em_fp8087.s
-	$(CC1) em_fp8087.s
-
-$(LIBRARY)(em_gto.o):	em_gto.s
-	$(CC1) em_gto.s
-
-$(LIBRARY)(em_hol0.o):	em_hol0.s
-	$(CC1) em_hol0.s
-
-$(LIBRARY)(em_iaar.o):	em_iaar.s
-	$(CC1) em_iaar.s
-
-$(LIBRARY)(em_ilar.o):	em_ilar.s
-	$(CC1) em_ilar.s
-
-$(LIBRARY)(em_inn.o):	em_inn.s
-	$(CC1) em_inn.s
-
-$(LIBRARY)(em_ior.o):	em_ior.s
-	$(CC1) em_ior.s
-
-$(LIBRARY)(em_isar.o):	em_isar.s
-	$(CC1) em_isar.s
-
-$(LIBRARY)(em_lar4.o):	em_lar4.s
-	$(CC1) em_lar4.s
-
-$(LIBRARY)(em_loi.o):	em_loi.s
-	$(CC1) em_loi.s
-
-$(LIBRARY)(em_mlf4.o):	em_mlf4.s
-	$(CC1) em_mlf4.s
-
-$(LIBRARY)(em_mlf8.o):	em_mlf8.s
-	$(CC1) em_mlf8.s
-
-$(LIBRARY)(em_mli.o):	em_mli.s
-	$(CC1) em_mli.s
-
-$(LIBRARY)(em_mon.o):	em_mon.s
-	$(CC1) em_mon.s
-
-$(LIBRARY)(em_ngf4.o):	em_ngf4.s
-	$(CC1) em_ngf4.s
-
-$(LIBRARY)(em_ngf8.o):	em_ngf8.s
-	$(CC1) em_ngf8.s
-
-$(LIBRARY)(em_ngi.o):	em_ngi.s
-	$(CC1) em_ngi.s
-
-$(LIBRARY)(em_nop.o):	em_nop.s
-	$(CC1) em_nop.s
-
-$(LIBRARY)(em_print.o):	em_print.s
-	$(CC1) em_print.s
-
-$(LIBRARY)(em_rck.o):	em_rck.s
-	$(CC1) em_rck.s
-
-$(LIBRARY)(em_rmi.o):	em_rmi.s
-	$(CC1) em_rmi.s
-
-$(LIBRARY)(em_rmu.o):	em_rmu.s
-	$(CC1) em_rmu.s
-
-$(LIBRARY)(em_rol.o):	em_rol.s
-	$(CC1) em_rol.s
-
-$(LIBRARY)(em_ror.o):	em_ror.s
-	$(CC1) em_ror.s
-
-$(LIBRARY)(em_sar4.o):	em_sar4.s
-	$(CC1) em_sar4.s
-
-$(LIBRARY)(em_sbf4.o):	em_sbf4.s
-	$(CC1) em_sbf4.s
-
-$(LIBRARY)(em_sbf8.o):	em_sbf8.s
-	$(CC1) em_sbf8.s
-
-$(LIBRARY)(em_sbi.o):	em_sbi.s
-	$(CC1) em_sbi.s
-
-$(LIBRARY)(em_set.o):	em_set.s
-	$(CC1) em_set.s
-
-$(LIBRARY)(em_sli.o):	em_sli.s
-	$(CC1) em_sli.s
-
-$(LIBRARY)(em_sri.o):	em_sri.s
-	$(CC1) em_sri.s
-
-$(LIBRARY)(em_sti.o):	em_sti.s
-	$(CC1) em_sti.s
-
-$(LIBRARY)(em_stop.o):	em_stop.s
-	$(CC1) em_stop.s
-
-$(LIBRARY)(em_trp.o):	em_trp.s
-	$(CC1) em_trp.s
-
-$(LIBRARY)(em_unknown.o):	em_unknown.s
-	$(CC1) em_unknown.s
-
-$(LIBRARY)(em_xor.o):	em_xor.s
-	$(CC1) em_xor.s
diff --git a/lib/ack/i386/em/Makefile.in b/lib/ack/i386/em/Makefile.in
new file mode 100644
index 000000000..793dc6fd0
--- /dev/null
+++ b/lib/ack/i386/em/Makefile.in
@@ -0,0 +1,78 @@
+# Makefile for lib/ack/i386/em.
+
+CFLAGS="-O -D_MINIX -D_POSIX_SOURCE -Was-ack"
+
+LIBRARIES=libe
+
+libe_FILES=" \
+	em_adf4.s \
+	em_adf8.s \
+	em_adi.s \
+	em_and.s \
+	em_blm.s \
+	em_cff4.s \
+	em_cff8.s \
+	em_cfi.s \
+	em_cfu.s \
+	em_cif4.s \
+	em_cif8.s \
+	em_cii.s \
+	em_cmf4.s \
+	em_cmf8.s \
+	em_cms.s \
+	em_com.s \
+	em_csa4.s \
+	em_csb4.s \
+	em_cuf4.s \
+	em_cuf8.s \
+	em_cuu.s \
+	em_dup.s \
+	em_dvf4.s \
+	em_dvf8.s \
+	em_dvi.s \
+	em_dvu.s \
+	em_error.s \
+	em_exg.s \
+	em_fat.s \
+	em_fef4.s \
+	em_fef8.s \
+	em_fif4.s \
+	em_fif8.s \
+	em_fp8087.s \
+	em_gto.s \
+	em_hol0.s \
+	em_iaar.s \
+	em_ilar.s \
+	em_inn.s \
+	em_ior.s \
+	em_isar.s \
+	em_lar4.s \
+	em_loi.s \
+	em_mlf4.s \
+	em_mlf8.s \
+	em_mli.s \
+	em_mon.s \
+	em_ngf4.s \
+	em_ngf8.s \
+	em_ngi.s \
+	em_nop.s \
+	em_print.s \
+	em_rck.s \
+	em_rmi.s \
+	em_rmu.s \
+	em_rol.s \
+	em_ror.s \
+	em_sar4.s \
+	em_sbf4.s \
+	em_sbf8.s \
+	em_sbi.s \
+	em_set.s \
+	em_sli.s \
+	em_sri.s \
+	em_sti.s \
+	em_stop.s \
+	em_trp.s \
+	em_unknown.s \
+	em_xor.s"
+
+TYPE=ack
diff --git a/lib/ack/i386/head/Makefile b/lib/ack/i386/head/Makefile
deleted file mode 100644
index 1d2bd521a..000000000
--- a/lib/ack/i386/head/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# Makefile for lib/ack/i386/head.
-
-ASFLAGS = -I.
-
-LIBRARIES = libe
-
-libe_OBJECTS = em_head.o
-
-include ../../../Makefile.ack.inc
diff --git a/lib/ack/i386/head/Makefile.ack.conv b/lib/ack/i386/head/Makefile.ack.conv
deleted file mode 100755
index e4d5ddb58..000000000
--- a/lib/ack/i386/head/Makefile.ack.conv
+++ /dev/null
@@ -1,13 +0,0 @@
-# Makefile for lib/i386/head.
-
-CC1	= $(CC) -Was-ack -c -I$(SRCDIR)/$(SUBDIR)
-
-LIBRARY	= ../../../libe.a
-all:	$(LIBRARY)
-
-$(LIBRARY):	$(LIBRARY)(em_head.o)
-	aal cr $@ *.o
-	rm *.o
-
-$(LIBRARY)(em_head.o):	em_head.s
-	$(CC1) -I. em_head.s
diff --git a/lib/ack/i386/head/Makefile.in b/lib/ack/i386/head/Makefile.in
new file mode 100644
index 000000000..ca0f3992d
--- /dev/null
+++ b/lib/ack/i386/head/Makefile.in
@@ -0,0 +1,9 @@
+# Makefile for lib/ack/i386/head.
+
+#ASFLAGS = -I.
+
+LIBRARIES=libe
+
+libe_FILES=em_head.s
+
+TYPE=ack
diff --git a/lib/ack/i386/head/em_head.s b/lib/ack/i386/head/em_head.s
index 2164dbcc7..ec0d74919 100755
--- a/lib/ack/i386/head/em_head.s
+++ b/lib/ack/i386/head/em_head.s
@@ -11,7 +11,7 @@ EILLINS		= 18
 EODDZ		= 19
 ECASE		= 20
 
-#include <em_abs.h>
+#include "em_abs.h"
 
 .sect .data
 .trppc:
diff --git a/lib/ack/libm2/Makefile b/lib/ack/libm2/Makefile
deleted file mode 100644
index a9ec9b7e3..000000000
--- a/lib/ack/libm2/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# Makefile for lib/ack/libm2.
-
-CFLAGS	= -O -I../h -wo
-M2FLAGS	= -O -ws -n
-
-LIBRARIES = libm2
-
-libm2_OBJECTS	= \
-	Arguments.o \
-	ArraySort.o \
-	CSP.o \
-	Conversion.o \
-	EM.o \
-	InOut.o \
-	LtoUset.o \
-	MathLib0.o \
-	Mathlib.o \
-	PascalIO.o \
-	Processes.o \
-	RealConver.o \
-	RealInOut.o \
-	SYSTEM.o \
-	Semaphores.o \
-	Storage.o \
-	StrAss.o \
-	Streams.o \
-	Strings.o \
-	Termcap.o \
-	Terminal.o \
-	Traps.o \
-	XXTermcap.o \
-	absd.o \
-	absf.o \
-	absi.o \
-	absl.o \
-	blockmove.o \
-	cap.o \
-	catch.o \
-	confarray.o \
-	dvi.o \
-	halt.o \
-	head_m2.o \
-	init.o \
-	load.o \
-	par_misc.o \
-	random.o \
-	rcka.o \
-	rcki.o \
-	rckil.o \
-	rcku.o \
-	rckul.o \
-	sigtrp.o \
-	stackprio.o \
-	store.o \
-	ucheck.o \
-
-include ../../Makefile.ack.inc
diff --git a/lib/ack/libm2/Makefile.ack.conv b/lib/ack/libm2/Makefile.ack.conv
deleted file mode 100755
index 956ea09c0..000000000
--- a/lib/ack/libm2/Makefile.ack.conv
+++ /dev/null
@@ -1,204 +0,0 @@
-# Makefile for lib/ack/libm2.
-
-M2	= m2
-CFLAGS	= -O -I$(SRCDIR)/ack/h -wo
-CC1	= $(CC) $(CFLAGS) -c
-M2FLAGS	= -O -ws -n
-M21	= $(M2) $(M2FLAGS) -c
-
-LIBRARY	= ../../libm2.a
-all:	$(LIBRARY)
-
-OBJECTS	= \
-	$(LIBRARY)(Arguments.o) \
-	$(LIBRARY)(ArraySort.o) \
-	$(LIBRARY)(CSP.o) \
-	$(LIBRARY)(Conversion.o) \
-	$(LIBRARY)(EM.o) \
-	$(LIBRARY)(InOut.o) \
-	$(LIBRARY)(LtoUset.o) \
-	$(LIBRARY)(MathLib0.o) \
-	$(LIBRARY)(Mathlib.o) \
-	$(LIBRARY)(PascalIO.o) \
-	$(LIBRARY)(Processes.o) \
-	$(LIBRARY)(RealConver.o) \
-	$(LIBRARY)(RealInOut.o) \
-	$(LIBRARY)(SYSTEM.o) \
-	$(LIBRARY)(Semaphores.o) \
-	$(LIBRARY)(Storage.o) \
-	$(LIBRARY)(StrAss.o) \
-	$(LIBRARY)(Streams.o) \
-	$(LIBRARY)(Strings.o) \
-	$(LIBRARY)(Termcap.o) \
-	$(LIBRARY)(Terminal.o) \
-	$(LIBRARY)(Traps.o) \
-	$(LIBRARY)(XXTermcap.o) \
-	$(LIBRARY)(absd.o) \
-	$(LIBRARY)(absf.o) \
-	$(LIBRARY)(absi.o) \
-	$(LIBRARY)(absl.o) \
-	$(LIBRARY)(blockmove.o) \
-	$(LIBRARY)(cap.o) \
-	$(LIBRARY)(catch.o) \
-	$(LIBRARY)(confarray.o) \
-	$(LIBRARY)(dvi.o) \
-	$(LIBRARY)(halt.o) \
-	$(LIBRARY)(head_m2.o) \
-	$(LIBRARY)(init.o) \
-	$(LIBRARY)(load.o) \
-	$(LIBRARY)(par_misc.o) \
-	$(LIBRARY)(random.o) \
-	$(LIBRARY)(rcka.o) \
-	$(LIBRARY)(rcki.o) \
-	$(LIBRARY)(rckil.o) \
-	$(LIBRARY)(rcku.o) \
-	$(LIBRARY)(rckul.o) \
-	$(LIBRARY)(sigtrp.o) \
-	$(LIBRARY)(stackprio.o) \
-	$(LIBRARY)(store.o) \
-	$(LIBRARY)(ucheck.o) \
-
-$(LIBRARY):	$(OBJECTS)
-	aal cr $@ *.o
-	rm *.o
-
-$(LIBRARY)(Arguments.o):	Arguments.c
-	$(CC1) Arguments.c
-
-$(LIBRARY)(ArraySort.o):	ArraySort.mod
-	$(M21) ArraySort.mod
-
-$(LIBRARY)(CSP.o):	CSP.mod
-	$(M21) CSP.mod
-
-$(LIBRARY)(Conversion.o):	Conversion.mod
-	$(M21) Conversion.mod
-
-$(LIBRARY)(EM.o):	EM.e
-	$(CC1) EM.e
-
-$(LIBRARY)(InOut.o):	InOut.mod
-	$(M21) InOut.mod
-
-$(LIBRARY)(LtoUset.o):	LtoUset.e
-	$(CC1) LtoUset.e
-
-$(LIBRARY)(MathLib0.o):	MathLib0.mod
-	$(M21) MathLib0.mod
-
-$(LIBRARY)(Mathlib.o):	Mathlib.mod
-	$(M21) Mathlib.mod
-
-$(LIBRARY)(PascalIO.o):	PascalIO.mod
-	$(M21) PascalIO.mod
-
-$(LIBRARY)(Processes.o):	Processes.mod
-	$(M21) Processes.mod
-
-$(LIBRARY)(RealConver.o):	RealConver.mod
-	$(M21) RealConver.mod
-
-$(LIBRARY)(RealInOut.o):	RealInOut.mod
-	$(M21) RealInOut.mod
-
-$(LIBRARY)(SYSTEM.o):	SYSTEM.c
-	$(CC1) SYSTEM.c
-
-$(LIBRARY)(Semaphores.o):	Semaphores.mod
-	$(M21) Semaphores.mod
-
-$(LIBRARY)(Storage.o):	Storage.mod
-	$(M21) Storage.mod
-
-$(LIBRARY)(StrAss.o):	StrAss.c
-	$(CC1) StrAss.c
-
-$(LIBRARY)(Streams.o):	Streams.mod
-	$(M21) Streams.mod
-
-$(LIBRARY)(Strings.o):	Strings.mod
-	$(M21) Strings.mod
-
-$(LIBRARY)(Termcap.o):	Termcap.mod
-	$(M21) Termcap.mod
-
-$(LIBRARY)(Terminal.o):	Terminal.mod
-	$(M21) -D__USG Terminal.mod
-
-$(LIBRARY)(Traps.o):	Traps.mod
-	$(M21) Traps.mod
-
-$(LIBRARY)(XXTermcap.o):	XXTermcap.c
-	$(CC1) XXTermcap.c
-
-$(LIBRARY)(absd.o):	absd.c
-	$(CC1) absd.c
-
-$(LIBRARY)(absf.o):	absf.e
-	$(CC1) absf.e
-
-$(LIBRARY)(absi.o):	absi.c
-	$(CC1) absi.c
-
-$(LIBRARY)(absl.o):	absl.c
-	$(CC1) absl.c
-
-$(LIBRARY)(blockmove.o):	blockmove.c
-	$(CC1) blockmove.c
-
-$(LIBRARY)(cap.o):	cap.c
-	$(CC1) cap.c
-
-$(LIBRARY)(catch.o):	catch.c
-	$(CC1) catch.c
-
-$(LIBRARY)(confarray.o):	confarray.c
-	$(CC1) confarray.c
-
-$(LIBRARY)(dvi.o):	dvi.c
-	$(CC1) dvi.c
-
-$(LIBRARY)(halt.o):	halt.c
-	$(CC1) halt.c
-
-$(LIBRARY)(head_m2.o):	head_m2.e
-	$(CC1) head_m2.e
-
-$(LIBRARY)(init.o):	init.c
-	$(CC1) init.c
-
-$(LIBRARY)(load.o):	load.c
-	$(CC1) load.c
-
-$(LIBRARY)(par_misc.o):	par_misc.e
-	$(CC1) par_misc.e
-
-$(LIBRARY)(random.o):	random.mod
-	$(M21) random.mod
-
-$(LIBRARY)(rcka.o):	rcka.c
-	$(CC1) rcka.c
-
-$(LIBRARY)(rcki.o):	rcki.c
-	$(CC1) rcki.c
-
-$(LIBRARY)(rckil.o):	rckil.c
-	$(CC1) rckil.c
-
-$(LIBRARY)(rcku.o):	rcku.c
-	$(CC1) rcku.c
-
-$(LIBRARY)(rckul.o):	rckul.c
-	$(CC1) rckul.c
-
-$(LIBRARY)(sigtrp.o):	sigtrp.c
-	$(CC1) sigtrp.c
-
-$(LIBRARY)(stackprio.o):	stackprio.c
-	$(CC1) stackprio.c
-
-$(LIBRARY)(store.o):	store.c
-	$(CC1) store.c
-
-$(LIBRARY)(ucheck.o):	ucheck.c
-	$(CC1) ucheck.c
diff --git a/lib/ack/libm2/Makefile.in b/lib/ack/libm2/Makefile.in
new file mode 100644
index 000000000..270c8704f
--- /dev/null
+++ b/lib/ack/libm2/Makefile.in
@@ -0,0 +1,57 @@
+# Makefile for lib/ack/libm2.
+
+CFLAGS="-O -I../h -wo"
+M2FLAGS="-O -ws -n"
+
+LIBRARIES=libm2
+
+libm2_FILES=" \
+	Arguments.c \
+	ArraySort.mod \
+	CSP.mod \
+	Conversion.mod \
+	EM.e \
+	InOut.mod \
+	LtoUset.e \
+	MathLib0.mod \
+	Mathlib.mod \
+	PascalIO.mod \
+	Processes.mod \
+	RealConver.mod \
+	RealInOut.mod \
+	SYSTEM.c \
+	Semaphores.mod \
+	Storage.mod \
+	StrAss.c \
+	Streams.mod \
+	Strings.mod \
+	Termcap.mod \
+	Terminal.mod \
+	Traps.mod \
+	XXTermcap.c \
+	absd.c \
+	absf.e \
+	absi.c \
+	absl.c \
+	blockmove.c \
+	cap.c \
+	catch.c \
+	confarray.c \
+	dvi.c \
+	halt.c \
+	head_m2.e \
+	init.c \
+	load.c \
+	par_misc.e \
+	random.mod \
+	rcka.c \
+	rcki.c \
+	rckil.c \
+	rcku.c \
+	rckul.c \
+	sigtrp.c \
+	stackprio.c \
+	store.c \
+	ucheck.c" 
+	
+TYPE=ack
diff --git a/lib/ack/libp/Makefile b/lib/ack/libp/Makefile
deleted file mode 100644
index 6a780d79b..000000000
--- a/lib/ack/libp/Makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-# Makefile for lib/ack/libp.
-
-CFLAGS	= -O -I../h -wo
-CC1	= $(CC) $(CFLAGS) -c
-
-LIBRARIES = libp
-
-libp_OBJECTS	= \
-	abi.o \
-	abl.o \
-	abr.o \
-	arg.o \
-	ass.o \
-	asz.o \
-	atn.o \
-	bcp.o \
-	bts.o \
-	buff.o \
-	catch.o \
-	clock.o \
-	cls.o \
-	cvt.o \
-	diag.o \
-	dis.o \
-	efl.o \
-	eln.o \
-	encaps.o \
-	exp.o \
-	fef.o \
-	fif.o \
-	get.o \
-	gto.o \
-	head_pc.o \
-	hlt.o \
-	hol0.o \
-	incpt.o \
-	ini.o \
-	log.o \
-	mdi.o \
-	mdl.o \
-	new.o \
-	nfa.o \
-	nobuff.o \
-	notext.o \
-	opn.o \
-	outcpt.o \
-	pac.o \
-	pclose.o \
-	pcreat.o \
-	pentry.o \
-	perrno.o \
-	pexit.o \
-	popen.o \
-	put.o \
-	rcka.o \
-	rdc.o \
-	rdi.o \
-	rdl.o \
-	rdr.o \
-	rf.o \
-	rln.o \
-	rnd.o \
-	sav.o \
-	sig.o \
-	sin.o \
-	sqt.o \
-	string.o \
-	trap.o \
-	trp.o \
-	unp.o \
-	uread.o \
-	uwrite.o \
-	wdw.o \
-	wf.o \
-	wrc.o \
-	wrf.o \
-	wri.o \
-	wrl.o \
-	wrr.o \
-	wrs.o \
-	wrz.o \
-
-include ../../Makefile.ack.inc
diff --git a/lib/ack/libp/Makefile.ack.conv b/lib/ack/libp/Makefile.ack.conv
deleted file mode 100755
index 144e80cd4..000000000
--- a/lib/ack/libp/Makefile.ack.conv
+++ /dev/null
@@ -1,305 +0,0 @@
-# Makefile for lib/libp.
-
-CFLAGS	= -O -I$(SRCDIR)/ack/h -wo
-CC1	= $(CC) $(CFLAGS) -c
-
-LIBRARY	= ../../libp.a
-all:	$(LIBRARY)
-
-OBJECTS	= \
-	$(LIBRARY)(abi.o) \
-	$(LIBRARY)(abl.o) \
-	$(LIBRARY)(abr.o) \
-	$(LIBRARY)(arg.o) \
-	$(LIBRARY)(ass.o) \
-	$(LIBRARY)(asz.o) \
-	$(LIBRARY)(atn.o) \
-	$(LIBRARY)(bcp.o) \
-	$(LIBRARY)(bts.o) \
-	$(LIBRARY)(buff.o) \
-	$(LIBRARY)(catch.o) \
-	$(LIBRARY)(clock.o) \
-	$(LIBRARY)(cls.o) \
-	$(LIBRARY)(cvt.o) \
-	$(LIBRARY)(diag.o) \
-	$(LIBRARY)(dis.o) \
-	$(LIBRARY)(efl.o) \
-	$(LIBRARY)(eln.o) \
-	$(LIBRARY)(encaps.o) \
-	$(LIBRARY)(exp.o) \
-	$(LIBRARY)(fef.o) \
-	$(LIBRARY)(fif.o) \
-	$(LIBRARY)(get.o) \
-	$(LIBRARY)(gto.o) \
-	$(LIBRARY)(head_pc.o) \
-	$(LIBRARY)(hlt.o) \
-	$(LIBRARY)(hol0.o) \
-	$(LIBRARY)(incpt.o) \
-	$(LIBRARY)(ini.o) \
-	$(LIBRARY)(log.o) \
-	$(LIBRARY)(mdi.o) \
-	$(LIBRARY)(mdl.o) \
-	$(LIBRARY)(new.o) \
-	$(LIBRARY)(nfa.o) \
-	$(LIBRARY)(nobuff.o) \
-	$(LIBRARY)(notext.o) \
-	$(LIBRARY)(opn.o) \
-	$(LIBRARY)(outcpt.o) \
-	$(LIBRARY)(pac.o) \
-	$(LIBRARY)(pclose.o) \
-	$(LIBRARY)(pcreat.o) \
-	$(LIBRARY)(pentry.o) \
-	$(LIBRARY)(perrno.o) \
-	$(LIBRARY)(pexit.o) \
-	$(LIBRARY)(popen.o) \
-	$(LIBRARY)(put.o) \
-	$(LIBRARY)(rcka.o) \
-	$(LIBRARY)(rdc.o) \
-	$(LIBRARY)(rdi.o) \
-	$(LIBRARY)(rdl.o) \
-	$(LIBRARY)(rdr.o) \
-	$(LIBRARY)(rf.o) \
-	$(LIBRARY)(rln.o) \
-	$(LIBRARY)(rnd.o) \
-	$(LIBRARY)(sav.o) \
-	$(LIBRARY)(sig.o) \
-	$(LIBRARY)(sin.o) \
-	$(LIBRARY)(sqt.o) \
-	$(LIBRARY)(string.o) \
-	$(LIBRARY)(trap.o) \
-	$(LIBRARY)(trp.o) \
-	$(LIBRARY)(unp.o) \
-	$(LIBRARY)(uread.o) \
-	$(LIBRARY)(uwrite.o) \
-	$(LIBRARY)(wdw.o) \
-	$(LIBRARY)(wf.o) \
-	$(LIBRARY)(wrc.o) \
-	$(LIBRARY)(wrf.o) \
-	$(LIBRARY)(wri.o) \
-	$(LIBRARY)(wrl.o) \
-	$(LIBRARY)(wrr.o) \
-	$(LIBRARY)(wrs.o) \
-	$(LIBRARY)(wrz.o) \
-
-$(LIBRARY):	$(OBJECTS)
-	aal cr $@ *.o
-	rm *.o
-
-$(LIBRARY)(abi.o):	abi.c
-	$(CC1) abi.c
-
-$(LIBRARY)(abl.o):	abl.c
-	$(CC1) abl.c
-
-$(LIBRARY)(abr.o):	abr.c
-	$(CC1) abr.c
-
-$(LIBRARY)(arg.o):	arg.c
-	$(CC1) arg.c
-
-$(LIBRARY)(ass.o):	ass.c
-	$(CC1) ass.c
-
-$(LIBRARY)(asz.o):	asz.c
-	$(CC1) asz.c
-
-$(LIBRARY)(atn.o):	atn.c
-	$(CC1) atn.c
-
-$(LIBRARY)(bcp.o):	bcp.c
-	$(CC1) bcp.c
-
-$(LIBRARY)(bts.o):	bts.e
-	$(CC1) bts.e
-
-$(LIBRARY)(buff.o):	buff.c
-	$(CC1) buff.c
-
-$(LIBRARY)(catch.o):	catch.c
-	$(CC1) catch.c
-
-$(LIBRARY)(clock.o):	clock.c
-	$(CC1) clock.c
-
-$(LIBRARY)(cls.o):	cls.c
-	$(CC1) cls.c
-
-$(LIBRARY)(cvt.o):	cvt.c
-	$(CC1) cvt.c
-
-$(LIBRARY)(diag.o):	diag.c
-	$(CC1) diag.c
-
-$(LIBRARY)(dis.o):	dis.c
-	$(CC1) dis.c
-
-$(LIBRARY)(efl.o):	efl.c
-	$(CC1) efl.c
-
-$(LIBRARY)(eln.o):	eln.c
-	$(CC1) eln.c
-
-$(LIBRARY)(encaps.o):	encaps.e
-	$(CC1) encaps.e
-
-$(LIBRARY)(exp.o):	exp.c
-	$(CC1) exp.c
-
-$(LIBRARY)(fef.o):	fef.e
-	$(CC1) fef.e
-
-$(LIBRARY)(fif.o):	fif.e
-	$(CC1) fif.e
-
-$(LIBRARY)(get.o):	get.c
-	$(CC1) get.c
-
-$(LIBRARY)(gto.o):	gto.e
-	$(CC1) gto.e
-
-$(LIBRARY)(head_pc.o):	head_pc.e
-	$(CC1) head_pc.e
-
-$(LIBRARY)(hlt.o):	hlt.c
-	$(CC1) hlt.c
-
-$(LIBRARY)(hol0.o):	hol0.e
-	$(CC1) hol0.e
-
-$(LIBRARY)(incpt.o):	incpt.c
-	$(CC1) incpt.c
-
-$(LIBRARY)(ini.o):	ini.c
-	$(CC1) ini.c
-
-$(LIBRARY)(log.o):	log.c
-	$(CC1) log.c
-
-$(LIBRARY)(mdi.o):	mdi.c
-	$(CC1) mdi.c
-
-$(LIBRARY)(mdl.o):	mdl.c
-	$(CC1) mdl.c
-
-$(LIBRARY)(new.o):	new.c
-	$(CC1) new.c
-
-$(LIBRARY)(nfa.o):	nfa.c
-	$(CC1) nfa.c
-
-$(LIBRARY)(nobuff.o):	nobuff.c
-	$(CC1) nobuff.c
-
-$(LIBRARY)(notext.o):	notext.c
-	$(CC1) notext.c
-
-$(LIBRARY)(opn.o):	opn.c
-	$(CC1) opn.c
-
-$(LIBRARY)(outcpt.o):	outcpt.c
-	$(CC1) outcpt.c
-
-$(LIBRARY)(pac.o):	pac.c
-	$(CC1) pac.c
-
-$(LIBRARY)(pclose.o):	pclose.c
-	$(CC1) pclose.c
-
-$(LIBRARY)(pcreat.o):	pcreat.c
-	$(CC1) pcreat.c
-
-$(LIBRARY)(pentry.o):	pentry.c
-	$(CC1) pentry.c
-
-$(LIBRARY)(perrno.o):	perrno.c
-	$(CC1) perrno.c
-
-$(LIBRARY)(pexit.o):	pexit.c
-	$(CC1) pexit.c
-
-$(LIBRARY)(popen.o):	popen.c
-	$(CC1) popen.c
-
-$(LIBRARY)(put.o):	put.c
-	$(CC1) put.c
-
-$(LIBRARY)(rcka.o):	rcka.c
-	$(CC1) rcka.c
-
-$(LIBRARY)(rdc.o):	rdc.c
-	$(CC1) rdc.c
-
-$(LIBRARY)(rdi.o):	rdi.c
-	$(CC1) rdi.c
-
-$(LIBRARY)(rdl.o):	rdl.c
-	$(CC1) rdl.c
-
-$(LIBRARY)(rdr.o):	rdr.c
-	$(CC1) rdr.c
-
-$(LIBRARY)(rf.o):	rf.c
-	$(CC1) rf.c
-
-$(LIBRARY)(rln.o):	rln.c
-	$(CC1) rln.c
-
-$(LIBRARY)(rnd.o):	rnd.c
-	$(CC1) rnd.c
-
-$(LIBRARY)(sav.o):	sav.e
-	$(CC1) sav.e
-
-$(LIBRARY)(sig.o):	sig.e
-	$(CC1) sig.e
-
-$(LIBRARY)(sin.o):	sin.c
-	$(CC1) sin.c
-
-$(LIBRARY)(sqt.o):	sqt.c
-	$(CC1) sqt.c
-
-$(LIBRARY)(string.o):	string.c
-	$(CC1) string.c
-
-$(LIBRARY)(trap.o):	trap.e
-	$(CC1) trap.e
-
-$(LIBRARY)(trp.o):	trp.e
-	$(CC1) trp.e
-
-$(LIBRARY)(unp.o):	unp.c
-	$(CC1) unp.c
-
-$(LIBRARY)(uread.o):	uread.c
-	$(CC1) uread.c
-
-$(LIBRARY)(uwrite.o):	uwrite.c
-	$(CC1) uwrite.c
-
-$(LIBRARY)(wdw.o):	wdw.c
-	$(CC1) wdw.c
-
-$(LIBRARY)(wf.o):	wf.c
-	$(CC1) wf.c
-
-$(LIBRARY)(wrc.o):	wrc.c
-	$(CC1) wrc.c
-
-$(LIBRARY)(wrf.o):	wrf.c
-	$(CC1) wrf.c
-
-$(LIBRARY)(wri.o):	wri.c
-	$(CC1) wri.c
-
-$(LIBRARY)(wrl.o):	wrl.c
-	$(CC1) wrl.c
-
-$(LIBRARY)(wrr.o):	wrr.c
-	$(CC1) wrr.c
-
-$(LIBRARY)(wrs.o):	wrs.c
-	$(CC1) wrs.c
-
-$(LIBRARY)(wrz.o):	wrz.c
-	$(CC1) wrz.c
diff --git a/lib/ack/libp/Makefile.in b/lib/ack/libp/Makefile.in
new file mode 100644
index 000000000..3ca2fbd50
--- /dev/null
+++ b/lib/ack/libp/Makefile.in
@@ -0,0 +1,83 @@
+# Makefile for lib/ack/libp.
+
+CFLAGS="-O -I../h -wo"
+#CC1	= $(CC) $(CFLAGS) -c
+
+LIBRARIES=libp
+
+libp_FILES=" \
+	abi.c \
+	abl.c \
+	abr.c \
+	arg.c \
+	ass.c \
+	asz.c \
+	atn.c \
+	bcp.c \
+	bts.e \
+	buff.c \
+	catch.c \
+	clock.c \
+	cls.c \
+	cvt.c \
+	diag.c \
+	dis.c \
+	efl.c \
+	eln.c \
+	encaps.e \
+	exp.c \
+	fef.e \
+	fif.e \
+	get.c \
+	gto.e \
+	head_pc.e \
+	hlt.c \
+	hol0.e \
+	incpt.c \
+	ini.c \
+	log.c \
+	mdi.c \
+	mdl.c \
+	new.c \
+	nfa.c \
+	nobuff.c \
+	notext.c \
+	opn.c \
+	outcpt.c \
+	pac.c \
+	pclose.c \
+	pcreat.c \
+	pentry.c \
+	perrno.c \
+	pexit.c \
+	popen.c \
+	put.c \
+	rcka.c \
+	rdc.c \
+	rdi.c \
+	rdl.c \
+	rdr.c \
+	rf.c \
+	rln.c \
+	rnd.c \
+	sav.e \
+	sig.e \
+	sin.c \
+	sqt.c \
+	string.c \
+	trap.e \
+	trp.e \
+	unp.c \
+	uread.c \
+	uwrite.c \
+	wdw.c \
+	wf.c \
+	wrc.c \
+	wrf.c \
+	wri.c \
+	wrl.c \
+	wrr.c \
+	wrs.c \
+	wrz.c"
+
+TYPE=ack
diff --git a/lib/ack/liby/Makefile b/lib/ack/liby/Makefile
deleted file mode 100644
index e1bac55a8..000000000
--- a/lib/ack/liby/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# Makefile for lib/liby.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE -wo
-
-LIBRARIES = liby
-
-liby_OBJECTS	= \
-	main.o \
-	yyerror.o \
-
-include ../../Makefile.ack.inc
diff --git a/lib/ack/liby/Makefile.ack.conv b/lib/ack/liby/Makefile.ack.conv
deleted file mode 100755
index 664b34839..000000000
--- a/lib/ack/liby/Makefile.ack.conv
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for lib/liby.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE -wo
-CC1	= $(CC) $(CFLAGS) -c
-
-LIBRARY	= ../../liby.a
-all:	$(LIBRARY)
-
-OBJECTS	= \
-	$(LIBRARY)(main.o) \
-	$(LIBRARY)(yyerror.o) \
-
-$(LIBRARY):	$(OBJECTS)
-	aal cr $@ *.o
-	rm *.o
-
-$(LIBRARY)(main.o):	main.c
-	$(CC1) main.c
-
-$(LIBRARY)(yyerror.o):	yyerror.c
-	$(CC1) yyerror.c
diff --git a/lib/ack/liby/Makefile.in b/lib/ack/liby/Makefile.in
new file mode 100644
index 000000000..aab6f5b62
--- /dev/null
+++ b/lib/ack/liby/Makefile.in
@@ -0,0 +1,11 @@
+# Makefile for lib/liby.
+
+CFLAGS="-O -D_MINIX -D_POSIX_SOURCE -wo"
+
+LIBRARIES=liby
+
+liby_FILES=" \
+	main.c \
+	yyerror.c"
+
+TYPE=ack
diff --git a/lib/ack/math/Makefile b/lib/ack/math/Makefile
deleted file mode 100644
index e1f51c7c1..000000000
--- a/lib/ack/math/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# Makefile for lib/ack/math.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE
-
-LIBRARIES = libc
-
-libc_OBJECTS	= \
-	frexp.o \
-	modf.o \
-	isnan.o \
-	ldexp.o \
-
-include ../../Makefile.ack.inc
diff --git a/lib/ack/math/Makefile.ack.conv b/lib/ack/math/Makefile.ack.conv
deleted file mode 100755
index b520ac82b..000000000
--- a/lib/ack/math/Makefile.ack.conv
+++ /dev/null
@@ -1,29 +0,0 @@
-# Makefile for lib/math.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE
-CC1	= $(CC) $(CFLAGS) -c
-
-LIBRARY	= ../../libc.a
-all:	$(LIBRARY)
-
-OBJECTS	= \
-	$(LIBRARY)(frexp.o) \
-	$(LIBRARY)(modf.o) \
-	$(LIBRARY)(isnan.o) \
-	$(LIBRARY)(ldexp.o) \
-
-$(LIBRARY):	$(OBJECTS)
-	aal cr $@ *.o
-	rm *.o
-
-$(LIBRARY)(frexp.o):	frexp.s
-	$(CC1) frexp.s
-
-$(LIBRARY)(modf.o):	modf.s
-	$(CC1) modf.s
-
-$(LIBRARY)(isnan.o):	isnan.c
-	$(CC1) isnan.c
-
-$(LIBRARY)(ldexp.o):	ldexp.c
-	$(CC1) ldexp.c
diff --git a/lib/ack/math/Makefile.in b/lib/ack/math/Makefile.in
new file mode 100644
index 000000000..a05920268
--- /dev/null
+++ b/lib/ack/math/Makefile.in
@@ -0,0 +1,13 @@
+# Makefile for lib/ack/math.
+
+CFLAGS="-O -D_MINIX -D_POSIX_SOURCE"
+
+LIBRARIES=libc
+
+libc_FILES=" \
+	frexp.s \
+	modf.s \
+	isnan.c \
+	ldexp.c"
+
+TYPE=ack
diff --git a/lib/ack/rts/Makefile b/lib/ack/rts/Makefile
deleted file mode 100644
index 47785c427..000000000
--- a/lib/ack/rts/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Makefile for lib/ack/rts.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE
-
-LIBRARIES = libc
-
-libc_OBJECTS	= \
-	setjmp.o \
-
-include ../../Makefile.ack.inc
diff --git a/lib/ack/rts/Makefile.ack.conv b/lib/ack/rts/Makefile.ack.conv
deleted file mode 100755
index 4020dde29..000000000
--- a/lib/ack/rts/Makefile.ack.conv
+++ /dev/null
@@ -1,19 +0,0 @@
-# Makefile for lib/rts.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE
-CC1	= $(CC) $(CFLAGS) -c
-
-LIBRARY	= ../../libc.a
-
-all:	\
-	$(LIBRARY)
-
-OBJECTS	= \
-	$(LIBRARY)(setjmp.o) \
-
-$(LIBRARY):	$(OBJECTS)
-	aal cr $@ *.o
-	rm *.o
-
-$(LIBRARY)(setjmp.o):	setjmp.e
-	$(CC1) setjmp.e
diff --git a/lib/ack/rts/Makefile.in b/lib/ack/rts/Makefile.in
new file mode 100644
index 000000000..4405bc5bc
--- /dev/null
+++ b/lib/ack/rts/Makefile.in
@@ -0,0 +1,9 @@
+# Makefile for lib/ack/rts.
+
+CFLAGS="-O -D_MINIX -D_POSIX_SOURCE"
+
+LIBRARIES=libc
+
+libc_FILES=setjmp.e
+
+TYPE=ack
diff --git a/lib/ansi/Makefile b/lib/ansi/Makefile
deleted file mode 100755
index e698e49ad..000000000
--- a/lib/ansi/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-# Makefile for lib/ansi.
-
-# This Makefile compiles part of the C library, the functions required by the
-# ANSI C standard.  This Makefile, and those in the other subdirectories use
-# a little known feature of make, the ability to refer to a file within a
-# library.  The construct abs.o' names the file 'abs.o' contained
-# in 'libc.a'.  So the rule
-#
-#	abs.o:	abs.c
-#		cc -c abs.c
-#		aal cr libc.a abs.o
-#		rm abs.o
-#
-# compiles abs.c and installs the result abs.o in libc.a if abs.c is newer
-# than the abs.o in the library.  This Makefile does not work like this
-# precisely, it first compiles all changed source files and than installs
-# them all in one 'aal' command.
-
-# Many of the string functions in this directory are not used, because the
-# have fast assembly implementations.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE -D__USG
-
-LIBRARIES = libc
-libc_OBJECTS = \
-	abort.o \
-	abs.o \
-	asctime.o \
-	assert.o \
-	atexit.o \
-	atof.o \
-	atoi.o \
-	atol.o \
-	bsearch.o \
-	calloc.o \
-	chartab.o \
-	clock.o \
-	ctime.o \
-	difftime.o \
-	div.o \
-	errlist.o \
-	exit.o \
-	ext_comp.o \
-	getenv.o \
-	gmtime.o \
-	isalnum.o \
-	isalpha.o \
-	isascii.o \
-	iscntrl.o \
-	isdigit.o \
-	isgraph.o \
-	islower.o \
-	isprint.o \
-	ispunct.o \
-	isspace.o \
-	isupper.o \
-	isxdigit.o \
-	labs.o \
-	ldiv.o \
-	localeconv.o \
-	localtime.o \
-	malloc.o \
-	mblen.o \
-	mbstowcs.o \
-	mbtowc.o \
-	misc.o \
-	mktime.o \
-	qsort.o \
-	raise.o \
-	rand.o \
-	setlocale.o \
-	sigmisc.o \
-	signal.o \
-	strcoll.o \
-	strcspn.o \
-	strerror.o \
-	strftime.o \
-	strpbrk.o \
-	strspn.o \
-	strstr.o \
-	strtok.o \
-	strtol.o \
-	strxfrm.o \
-	system.o \
-	tolower.o \
-	toupper.o \
-	tzset.o \
-	wcstombs.o \
-	wctomb.o
-		
-include ../Makefile.inc
diff --git a/lib/ansi/Makefile.in b/lib/ansi/Makefile.in
new file mode 100644
index 000000000..cf29f2083
--- /dev/null
+++ b/lib/ansi/Makefile.in
@@ -0,0 +1,91 @@
+# Makefile for lib/ansi.
+
+# This Makefile compiles part of the C library, the functions required by the
+# ANSI C standard.  This Makefile, and those in the other subdirectories use
+# a little known feature of make, the ability to refer to a file within a
+# library.  The construct abs.o' names the file 'abs.o' contained
+# in 'libc.a'.  So the rule
+#
+#	abs.o:	abs.c
+#		cc -c abs.c
+#		aal cr libc.a abs.o
+#		rm abs.o
+#
+# compiles abs.c and installs the result abs.o in libc.a if abs.c is newer
+# than the abs.o in the library.  This Makefile does not work like this
+# precisely, it first compiles all changed source files and than installs
+# them all in one 'aal' command.
+
+# Many of the string functions in this directory are not used, because the
+# have fast assembly implementations.
+
+CFLAGS="-O -D_MINIX -D_POSIX_SOURCE -D__USG"
+
+LIBRARIES=libc
+libc_FILES=" \
+	abort.c \
+	abs.c \
+	asctime.c \
+	assert.c \
+	atexit.c \
+	atof.c \
+	atoi.c \
+	atol.c \
+	bsearch.c \
+	calloc.c \
+	chartab.c \
+	clock.c \
+	ctime.c \
+	difftime.c \
+	div.c \
+	errlist.c \
+	exit.c \
+	ext_comp.c \
+	getenv.c \
+	gmtime.c \
+	isalnum.c \
+	isalpha.c \
+	isascii.c \
+	iscntrl.c \
+	isdigit.c \
+	isgraph.c \
+	islower.c \
+	isprint.c \
+	ispunct.c \
+	isspace.c \
+	isupper.c \
+	isxdigit.c \
+	labs.c \
+	ldiv.c \
+	localeconv.c \
+	localtime.c \
+	malloc.c \
+	mblen.c \
+	mbstowcs.c \
+	mbtowc.c \
+	misc.c \
+	mktime.c \
+	qsort.c \
+	raise.c \
+	rand.c \
+	setlocale.c \
+	sigmisc.c \
+	signal.c \
+	strcoll.c \
+	strcspn.c \
+	strerror.c \
+	strftime.c \
+	strpbrk.c \
+	strspn.c \
+	strstr.c \
+	strtok.c \
+	strtol.c \
+	strxfrm.c \
+	system.c \
+	tolower.c \
+	toupper.c \
+	tzset.c \
+	wcstombs.c \
+	wctomb.c"
+		
+TYPE=both
diff --git a/lib/curses/Makefile b/lib/curses/Makefile
deleted file mode 100755
index 042607a93..000000000
--- a/lib/curses/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# Makefile for lib/curses.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE
-
-LIBRARIES = libcurses
-
-libcurses_OBJECTS	= \
-	beep.o \
-	charpick.o \
-	curs_set.o \
-	cursesio.o \
-	endwin.o \
-	flash.o \
-	initscr.o \
-	longname.o \
-	move.o \
-	mvcursor.o \
-	newwin.o \
-	options.o \
-	overlay.o \
-	prntscan.o \
-	refresh.o \
-	scrreg.o \
-	setterm.o \
-	tabsize.o \
-	termmisc.o \
-	unctrl.o \
-	update.o \
-	waddch.o \
-	waddstr.o \
-	wbox.o \
-	wclear.o \
-	wclrtobot.o \
-	wclrtoeol.o \
-	wdelch.o \
-	wdeleteln.o \
-	werase.o \
-	wgetch.o \
-	wgetstr.o \
-	windel.o \
-	winmove.o \
-	winsch.o \
-	winscrol.o \
-	winsertln.o \
-	wintouch.o \
-
-include ../Makefile.inc
diff --git a/lib/curses/Makefile.in b/lib/curses/Makefile.in
new file mode 100644
index 000000000..47fa2ca88
--- /dev/null
+++ b/lib/curses/Makefile.in
@@ -0,0 +1,47 @@
+# Makefile for lib/curses.
+
+CFLAGS="-O -D_MINIX -D_POSIX_SOURCE"
+
+LIBRARIES=libcurses
+
+libcurses_FILES=" \
+	beep.c \
+	charpick.c \
+	curs_set.c \
+	cursesio.c \
+	endwin.c \
+	flash.c \
+	initscr.c \
+	longname.c \
+	move.c \
+	mvcursor.c \
+	newwin.c \
+	options.c \
+	overlay.c \
+	prntscan.c \
+	refresh.c \
+	scrreg.c \
+	setterm.c \
+	tabsize.c \
+	termmisc.c \
+	unctrl.c \
+	update.c \
+	waddch.c \
+	waddstr.c \
+	wbox.c \
+	wclear.c \
+	wclrtobot.c \
+	wclrtoeol.c \
+	wdelch.c \
+	wdeleteln.c \
+	werase.c \
+	wgetch.c \
+	wgetstr.c \
+	windel.c \
+	winmove.c \
+	winsch.c \
+	winscrol.c \
+	winsertln.c \
+	wintouch.c"
+
+TYPE=both
diff --git a/lib/dummy/Makefile.ack b/lib/dummy/Makefile.ack
deleted file mode 100755
index 41b2cf9ac..000000000
--- a/lib/dummy/Makefile.ack
+++ /dev/null
@@ -1,11 +0,0 @@
-# Makefile for lib/dummy.
-
-# Make a dummy libm library so that -lm works.
-
-all:	../libm.a
-
-../libm.a:
-	echo "int __dummy__;" >dummy.c
-	$(CC) -c dummy.c
-	aal cr $@ dummy.o
-	rm dummy.?
diff --git a/lib/dummy/Makefile.gnu b/lib/dummy/Makefile.gnu
deleted file mode 100644
index 259774c52..000000000
--- a/lib/dummy/Makefile.gnu
+++ /dev/null
@@ -1,19 +0,0 @@
-
-CC=gcc
-AR=gar
-AS=gas
-LD=gld
-NM=gnm
-
-# Makefile for lib/dummy.
-
-# Make a dummy libm library so that -lm works.
-
-all:	../libm.a
-
-../libm.a:
-	echo "int __dummy__;" >dummy.c
-	$(CC) -c dummy.c
-	$(AR) cr $@ *.o
-	ranlib $@
-	rm dummy.?
diff --git a/lib/dummy/Makefile b/lib/dummy/Makefile.in
old mode 100755
new mode 100644
similarity index 53%
rename from lib/dummy/Makefile
rename to lib/dummy/Makefile.in
index d3801078b..e8ad80c10
--- a/lib/dummy/Makefile
+++ b/lib/dummy/Makefile.in
@@ -5,9 +5,9 @@
 
 LIBRARIES=libm
 
-libm_OBJECTS=dummy.o
+libm_FILES=dummy.c
 
-include ../Makefile.inc
+TYPE=both
 
-dummy.c:
-	echo "int __dummy__;" > $@
+#dummy.c:
+#	echo "int __dummy__;" > $@
diff --git a/lib/editline/Makefile b/lib/editline/Makefile.in
old mode 100755
new mode 100644
similarity index 66%
rename from lib/editline/Makefile
rename to lib/editline/Makefile.in
index fdf8d5dfb..77c93c4f6
--- a/lib/editline/Makefile
+++ b/lib/editline/Makefile.in
@@ -18,12 +18,12 @@
 ##	-DUSE_TERMCAP		Use the termcap library for terminal size
 ##				see LDFLAGS, below, if you set this.
 ##	-DNEED_PERROR		Don't have  (used in testit)
-DEFS	= -DANSI_ARROWS -DHAVE_STDLIB -DHAVE_TCGETATTR -DHIDE -DUSE_DIRENT \
-	-DHIST_SIZE=100 -DUSE_TERMCAP -DSYS_UNIX
+DEFS="-DANSI_ARROWS -DHAVE_STDLIB -DHAVE_TCGETATTR -DHIDE -DUSE_DIRENT \
+	-DHIST_SIZE=100 -DUSE_TERMCAP -DSYS_UNIX"
 #-DNEED_STRDUP
 
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE $(DEFS) -wo
-CC1	= $(CC) $(CFLAGS) -c
+CFLAGS="-O -D_MINIX -D_POSIX_SOURCE $DEFS -wo"
+#CC1	= $(CC) $(CFLAGS) -c
 
 ##  If you have -DUSE_TERMCAP, set this as appropriate:
 #LDFLAGS = -ltermlib
@@ -31,13 +31,14 @@ CC1	= $(CC) $(CFLAGS) -c
 
 ##  End of configuration.
 
-SOURCES	= editline.c complete.c sysunix.c
+#SOURCES	= editline.c complete.c sysunix.c
 #LIBRARY = ../libedit.a
-LIBRARIES = libedit
+LIBRARIES=libedit
 #OBJECTS	= editline.o complete.o sysunix.o
-libedit_OBJECTS = editline.o complete.o sysunix.o
-SHARFILES =	README Makefile editline.3 editline.h unix.h editline.c \
+libedit_FILES="editline.c complete.c sysunix.c"
+#SHARFILES =	README Makefile editline.3 editline.h unix.h editline.c \
 
-include ../Makefile.inc
+TYPE=both
+#include ../Makefile.inc
 
-$(call ADDDEPENDENCIES,$(libedit_OBJECTS),editline.h)
+#$(call ADDDEPENDENCIES,$(libedit_OBJECTS),editline.h)
diff --git a/lib/end/Makefile b/lib/end/Makefile
deleted file mode 100755
index 40c02bbf6..000000000
--- a/lib/end/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# Makefile for lib/end.
-
-LIBRARIES = end
-
-end_OBJECTS	= \
-	edata.o \
-	em_end.o \
-	end.o \
-	etext.o \
-
-include ../Makefile.inc
diff --git a/lib/end/Makefile.in b/lib/end/Makefile.in
new file mode 100644
index 000000000..369497d02
--- /dev/null
+++ b/lib/end/Makefile.in
@@ -0,0 +1,11 @@
+# Makefile for lib/end.
+
+LIBRARIES=end
+
+end_FILES=" \
+	edata.s \
+	em_end.s \
+	end.s \
+	etext.s"
+
+TYPE=both
diff --git a/lib/float/Makefile b/lib/float/Makefile
deleted file mode 100755
index 0a4369d8a..000000000
--- a/lib/float/Makefile
+++ /dev/null
@@ -1,164 +0,0 @@
-# Makefile for lib/float.
-
-CC1	= /bin/sh ./FP.compile
-
-LIBRARY	= ../libfp.a
-all:	$(LIBRARY)
-
-OBJECTS	= \
-	$(LIBRARY)(add_ext.o) \
-	$(LIBRARY)(adder.o) \
-	$(LIBRARY)(adf4.o) \
-	$(LIBRARY)(adf8.o) \
-	$(LIBRARY)(cff4.o) \
-	$(LIBRARY)(cff8.o) \
-	$(LIBRARY)(cfi.o) \
-	$(LIBRARY)(cfu.o) \
-	$(LIBRARY)(cif4.o) \
-	$(LIBRARY)(cif8.o) \
-	$(LIBRARY)(cmf4.o) \
-	$(LIBRARY)(cmf8.o) \
-	$(LIBRARY)(compact.o) \
-	$(LIBRARY)(cuf4.o) \
-	$(LIBRARY)(cuf8.o) \
-	$(LIBRARY)(div_ext.o) \
-	$(LIBRARY)(dvf4.o) \
-	$(LIBRARY)(dvf8.o) \
-	$(LIBRARY)(extend.o) \
-	$(LIBRARY)(fef4.o) \
-	$(LIBRARY)(fef8.o) \
-	$(LIBRARY)(fif4.o) \
-	$(LIBRARY)(fif8.o) \
-	$(LIBRARY)(fptrp.o) \
-	$(LIBRARY)(mlf4.o) \
-	$(LIBRARY)(mlf8.o) \
-	$(LIBRARY)(mul_ext.o) \
-	$(LIBRARY)(ngf4.o) \
-	$(LIBRARY)(ngf8.o) \
-	$(LIBRARY)(nrm_ext.o) \
-	$(LIBRARY)(sbf4.o) \
-	$(LIBRARY)(sbf8.o) \
-	$(LIBRARY)(sft_ext.o) \
-	$(LIBRARY)(shifter.o) \
-	$(LIBRARY)(sub_ext.o) \
-	$(LIBRARY)(zrf4.o) \
-	$(LIBRARY)(zrf8.o) \
-	$(LIBRARY)(zrf_ext.o) \
-
-$(LIBRARY):	$(OBJECTS)
-	aal cr $@ *.o
-	rm *.o
-
-$(LIBRARY)(add_ext.o):	add_ext.c
-	$(CC1) add_ext.c
-
-$(LIBRARY)(adder.o):	adder.c
-	$(CC1) adder.c
-
-$(LIBRARY)(adf4.o):	adf4.c
-	$(CC1) adf4.c
-
-$(LIBRARY)(adf8.o):	adf8.c
-	$(CC1) adf8.c
-
-$(LIBRARY)(cff4.o):	cff4.c
-	$(CC1) cff4.c
-
-$(LIBRARY)(cff8.o):	cff8.c
-	$(CC1) cff8.c
-
-$(LIBRARY)(cfi.o):	cfi.c
-	$(CC1) cfi.c
-
-$(LIBRARY)(cfu.o):	cfu.c
-	$(CC1) cfu.c
-
-$(LIBRARY)(cif4.o):	cif4.c
-	$(CC1) cif4.c
-
-$(LIBRARY)(cif8.o):	cif8.c
-	$(CC1) cif8.c
-
-$(LIBRARY)(cmf4.o):	cmf4.c
-	$(CC1) cmf4.c
-
-$(LIBRARY)(cmf8.o):	cmf8.c
-	$(CC1) cmf8.c
-
-$(LIBRARY)(compact.o):	compact.c
-	$(CC1) compact.c
-
-$(LIBRARY)(cuf4.o):	cuf4.c
-	$(CC1) cuf4.c
-
-$(LIBRARY)(cuf8.o):	cuf8.c
-	$(CC1) cuf8.c
-
-$(LIBRARY)(div_ext.o):	div_ext.c
-	$(CC1) div_ext.c
-
-$(LIBRARY)(dvf4.o):	dvf4.c
-	$(CC1) dvf4.c
-
-$(LIBRARY)(dvf8.o):	dvf8.c
-	$(CC1) dvf8.c
-
-$(LIBRARY)(extend.o):	extend.c
-	$(CC1) extend.c
-
-$(LIBRARY)(fef4.o):	fef4.c
-	$(CC1) fef4.c
-
-$(LIBRARY)(fef8.o):	fef8.c
-	$(CC1) fef8.c
-
-$(LIBRARY)(fif4.o):	fif4.c
-	$(CC1) fif4.c
-
-$(LIBRARY)(fif8.o):	fif8.c
-	$(CC1) fif8.c
-
-$(LIBRARY)(fptrp.o):	fptrp.s
-	$(CC) -c fptrp.s
-
-$(LIBRARY)(mlf4.o):	mlf4.c
-	$(CC1) mlf4.c
-
-$(LIBRARY)(mlf8.o):	mlf8.c
-	$(CC1) mlf8.c
-
-$(LIBRARY)(mul_ext.o):	mul_ext.c
-	$(CC1) mul_ext.c
-
-$(LIBRARY)(ngf4.o):	ngf4.c
-	$(CC1) ngf4.c
-
-$(LIBRARY)(ngf8.o):	ngf8.c
-	$(CC1) ngf8.c
-
-$(LIBRARY)(nrm_ext.o):	nrm_ext.c
-	$(CC1) nrm_ext.c
-
-$(LIBRARY)(sbf4.o):	sbf4.c
-	$(CC1) sbf4.c
-
-$(LIBRARY)(sbf8.o):	sbf8.c
-	$(CC1) sbf8.c
-
-$(LIBRARY)(sft_ext.o):	sft_ext.c
-	$(CC1) sft_ext.c
-
-$(LIBRARY)(shifter.o):	shifter.c
-	$(CC1) shifter.c
-
-$(LIBRARY)(sub_ext.o):	sub_ext.c
-	$(CC1) sub_ext.c
-
-$(LIBRARY)(zrf4.o):	zrf4.c
-	$(CC1) zrf4.c
-
-$(LIBRARY)(zrf8.o):	zrf8.c
-	$(CC1) zrf8.c
-
-$(LIBRARY)(zrf_ext.o):	zrf_ext.c
-	$(CC1) zrf_ext.c
diff --git a/lib/fphook/Makefile b/lib/fphook/Makefile
deleted file mode 100755
index d3904734f..000000000
--- a/lib/fphook/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# Makefile for lib/i86/fphook.
-
-# The ACK ANSI C compiler has an nice trick to reduce the size of programs
-# that do not use floating point.  If a program uses floating point then the
-# compiler generates an external reference to the label '_fp_hook'.  This makes
-# the loader bring in the floating point printing and conversion routines
-# '_f_print' and 'strtod' from the library libd.a.  Otherwise two dummy
-# routines are found in libc.a.  (The printf and scanf need floating point
-# for the %f formats, whether you use them or not.)
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE
-CC1	= $(CC) $(CFLAGS) -c
-
-LIBD	= ../libd.a
-LIBC	= ../libc.a
-
-all:	$(LIBD) $(LIBC)
-
-$(LIBD):	fphook.c
-	$(CC1) fphook.c
-	aal cr $@ fphook.o
-	rm fphook.o
-
-$(LIBC):	$(LIBC)(fltpr.o) $(LIBC)(strtod.o)
-	aal cr $@ *.o
-	rm *.o
-
-$(LIBC)(fltpr.o):
-	$(CC1) fltpr.c
-
-$(LIBC)(strtod.o):
-	$(CC1) strtod.c
diff --git a/lib/generate.sh b/lib/generate.sh
new file mode 100644
index 000000000..7016cffee
--- /dev/null
+++ b/lib/generate.sh
@@ -0,0 +1,255 @@
+#!/bin/sh
+# called with parameters: 1:dir 2:ackbase 3:gnubase
+
+exec  >Makefile
+exec 3>Makedepend-ack
+exec 4>Makedepend-gnu
+touch  .depend-ack
+touch  .depend-gnu
+
+echo "#Generated from $1/Makefile.in"
+
+ACKBASE=$2
+GNUBASE=$3
+OBJDIR=$1
+
+RECURSIVE_TARGETS="clean depend depend-ack depend-gnu"
+
+if [ -z $ACKBASE ]; then echo ACKBASE is not set!; exit 1; fi
+if [ -z $GNUBASE ]; then echo GNUBASE is not set!; exit 1; fi
+
+. Makefile.in
+
+#to enable library debugging, enable the next line
+#CFLAGS=$CFLAGS" -g"
+
+echo "all: all-ack"
+echo
+echo "all-ack:"
+echo "all-gnu:"
+echo
+echo "makefiles: Makefile"
+echo
+echo "Makefile: Makefile.in"
+echo "	sh $0 $OBJDIR $ACKBASE $GNUBASE"
+echo "	@echo"
+echo "	@echo \"*Attention*\""
+echo "	@echo \"Makefile is regenerated... rerun command to see changes\""
+echo "	@echo \"*Attention*\""
+echo "	@echo"
+echo
+if [ ! -z "$SUBDIRS" ]; then
+	echo "all-ack: makefiles"
+	for dir in $SUBDIRS
+	{
+		if [ $TYPE = "both" -o $TYPE = "ack" ]; then
+			echo "	mkdir -p $ACKBASE/$OBJDIR/$dir"
+		fi
+		echo "	cd $dir && \$(MAKE) \$@"
+	}
+	echo
+	echo "all-gnu: makefiles"
+	for dir in $SUBDIRS
+	{
+		if [ $TYPE = "both" -o $TYPE = "gnu" ]; then
+			echo "	mkdir -p $GNUBASE/$OBJDIR/$dir"
+		fi
+		
+		echo "	cd $dir && \$(MAKE) \$@"
+	}
+	echo
+	echo "$RECURSIVE_TARGETS:: makefiles"
+	for dir in $SUBDIRS
+	{
+		if [ $TYPE = "both" -o $TYPE = "ack" ]; then
+			#echo "	mkdir -p $ACKBASE/$OBJDIR/$dir"
+		fi
+		if [ $TYPE = "both" -o $TYPE = "gnu" ]; then
+			#echo "	mkdir -p $GNUBASE/$OBJDIR/$dir"
+		fi
+		
+		echo "	cd $dir && \$(MAKE) \$@"
+	}
+	echo
+	for dir in $SUBDIRS
+	{
+		echo "makefiles: $dir/Makefile"
+	}
+	echo
+	for dir in $SUBDIRS
+	{
+		echo "$dir/Makefile: $dir/Makefile.in"
+		echo "	cd $dir && sh ../$0 $OBJDIR/$dir ../$ACKBASE ../$GNUBASE && \$(MAKE) makefiles"
+	}
+else
+
+echo "depend: depend-ack"
+
+echo "depend-ack:" >&3
+echo "	rm .depend-ack" >&3
+echo "	touch .depend-ack" >&3
+
+echo "depend-gnu:" >&4
+echo "	rm .depend-gnu" >&4
+echo "	touch .depend-gnu" >&4
+
+ackCommands()
+{
+	dstfile=$1
+	srcfile=$2
+	dstdir=`dirname $dstfile`
+	
+	case $srcfile in
+	*.s | *.c | *.e )
+		echo "	cc $CFLAGS -c -o $dstfile $srcfile"
+		
+		echo "	mkdep 'cc $CFLAGS -E' $srcfile | sed -e 's:^\(.\):$dstdir/\1:' >> .depend-ack" >&3
+		;;
+	*.mod )
+		echo "	m2 $M2FLAGS -c -o $dstfile $srcfile"
+		
+		echo "	mkdep 'm2 $M2FLAGS -E' $srcfile | sed -e 's:^\(.\):$dstdir/\1:' >> .depend-ack" >&3
+		;;
+	*.fc )
+		echo "	sh ./FP.compile $dstfile $srcfile"
+		
+		echo "	mkdep 'cc -E' $srcfile | sed -e 's:^\(.\):$dstdir/\1:' >> .depend-ack" >&3
+		;;
+	esac
+}
+
+gnuCommands()
+{
+	dstfile=$1
+	srcfile=$2
+	dstdir=`dirname $dstfile`
+	sedcmd="sed -e '/<built-in>/d' -e '/<command line>/d' -e 's:^\(.\):$dstdir/\1:'"
+	
+	case $srcfile in
+	*.s )
+		echo "	gcc $CFLAGS -E -x assembler-with-cpp -I. $srcfile | asmconv -mi386 ack gnu > $GNUBASE/$OBJDIR/$srcfile.gnu || true"
+		echo "	gas -o $dstfile $GNUBASE/$OBJDIR/$srcfile.gnu"
+		
+		echo "	mkdep 'gcc $CFLAGS -E -x assembler-with-cpp -I.' $srcfile | $sedcmd >> .depend-gnu" >&4
+		;;
+	*.gs )
+		echo "	gas -o $dstfile $srcfile"
+		
+		echo "	mkdep 'gcc $CFLAGS -E -x assembler-with-cpp -I.' $srcfile | $sedcmd >> .depend-gnu" >&4
+		;;
+	*.c )
+		echo "	gcc $CFLAGS -c -o $dstfile $srcfile"
+		
+		echo "	mkdep 'gcc $CFLAGS -E' $srcfile | $sedcmd >> .depend-gnu" >&4
+		;;
+	#*.mod )
+	#	echo "	\$(M2C) -o $dstfile $srcfile"
+	#	;;
+	#*.fc )
+	#	echo "	sh ./FP.COMPILE $srcfile"
+	#	;;
+	esac
+	echo
+}
+
+#libraries
+for lib in $LIBRARIES
+{
+	if [ $TYPE = "both" -o $TYPE = "ack" ]; then
+		echo "all-ack: $ACKBASE/$lib.a"
+		eval "FILES=\$${lib}_FILES" 
+		echo
+		for f in $FILES
+		{
+			o=`echo $f | sed -e 's/\\..*\$/\.o/'`
+			echo "$ACKBASE/$lib.a: $ACKBASE/$lib.a($o)"
+		}
+		echo
+		echo "$ACKBASE/$lib.a:"
+		echo "	ar cr $ACKBASE/$lib.a $ACKBASE/$OBJDIR/*.o"
+		echo "	rm $ACKBASE/$OBJDIR/*.o"
+		echo
+		for f in $FILES
+		{
+			o=`echo $f | sed -e 's/\\..*\$/\.o/'`
+			echo "$ACKBASE/$lib.a($o): $f"
+			
+			ackCommands $ACKBASE/$OBJDIR/$o $f
+		}
+		echo
+	fi
+	
+	if [ $TYPE = "both" -o $TYPE = "gnu" ]; then
+		echo "all-gnu: $GNUBASE/$lib.a"
+		eval "FILES=\$${lib}_FILES" 
+		echo
+		for f in $FILES
+		{
+			o=`echo $f | sed -e 's/\\..*\$/\.o/'`
+			echo "$GNUBASE/$lib.a: $GNUBASE/$OBJDIR/$o"
+		}
+		echo
+		echo "$GNUBASE/$lib.a:"
+		echo "	gar cr $GNUBASE/$lib.a \$?"
+		echo
+		for f in $FILES
+		{
+			o=`echo $f | sed -e 's/\\..*\$/\.o/'`
+			
+			echo "$GNUBASE/$OBJDIR/$o: $f"
+			
+			gnuCommands $GNUBASE/$OBJDIR/$o $f
+		}
+		echo
+	fi
+}
+echo
+
+#start files
+for f in $STARTFILES
+{
+	o=`echo $f | sed -e 's/\\..*\$/\.o/'`
+	
+	if [ $TYPE = "both" -o $TYPE = "ack" ]; then
+		echo "all-ack: $ACKBASE/$o"
+		echo
+		echo "$ACKBASE/$o: $f"
+		ackCommands $ACKBASE/$o $f
+		echo
+	fi
+	if [ $TYPE = "both" -o $TYPE = "gnu" ]; then
+		echo "all-gnu: $GNUBASE/$o"
+		echo
+		echo "$GNUBASE/$o: $f"
+		gnuCommands $GNUBASE/$o $f
+		echo
+	fi
+}
+
+fi # elif of if [ -n "$SUBDIRS" ]
+echo
+echo "clean::"
+if [ $TYPE = "both" -o $TYPE = "ack" ]; then
+	echo "	rm -f $ACKBASE/$OBJDIR/*"
+fi
+if [ $TYPE = "both" -o $TYPE = "gnu" ]; then
+	echo "	rm -f $GNUBASE/$OBJDIR/*"
+fi
+
+if [ $OBJDIR = "." ]; then
+	echo
+	echo "install: install-ack"
+	echo
+	echo "install-ack: all-ack"
+	echo "	cp $ACKBASE/*.[ao] /usr/lib/i386"
+	echo
+	echo "install-gnu: all-gnu"
+	echo "	cp $GNUBASE/*.[ao] /usr/gnu/lib"
+fi
+
+echo
+echo "include Makedepend-ack"
+echo "include .depend-ack"
+echo
+echo "include Makedepend-gnu"
+echo "include .depend-gnu"
diff --git a/lib/gnu/Makefile b/lib/gnu/Makefile
deleted file mode 100644
index 889c60bf8..000000000
--- a/lib/gnu/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-
-SUBDIRS = \
-	end \
-	ieee_float \
-	rts \
-
-include ../Makefile.inc
diff --git a/lib/gnu/Makefile.gnu b/lib/gnu/Makefile.gnu
deleted file mode 100644
index 052cf6e3e..000000000
--- a/lib/gnu/Makefile.gnu
+++ /dev/null
@@ -1,5 +0,0 @@
-
-all:
-	cd end && gmake
-	cd ieee_float && gmake
-	cd rts && gmake
diff --git a/lib/gnu/Makefile.in b/lib/gnu/Makefile.in
new file mode 100644
index 000000000..cfc17794d
--- /dev/null
+++ b/lib/gnu/Makefile.in
@@ -0,0 +1,7 @@
+
+SUBDIRS=" \
+	end \
+	ieee_float \
+	rts"
+
+TYPE=gnu
diff --git a/lib/gnu/end/Makefile b/lib/gnu/end/Makefile
deleted file mode 100644
index c52618d4a..000000000
--- a/lib/gnu/end/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-
-LIBRARIES = end
-
-end_OBJECTS = gnu_end.o
-
-include ../../Makefile.gnu.inc
-
diff --git a/lib/gnu/end/Makefile.gnu b/lib/gnu/end/Makefile.gnu
deleted file mode 100644
index 8603fd6f8..000000000
--- a/lib/gnu/end/Makefile.gnu
+++ /dev/null
@@ -1,16 +0,0 @@
-CC=gcc
-AR=gar
-AS=gas
-
-VPATH=$(SRCDIR)/gnu/end
-
-LIBRARY=../../end.a
-OBJECTS=gnu_end.o
-
-all: $(LIBRARY)
-
-$(LIBRARY): $(OBJECTS)
-	$(AR) cr $@ *.o
-
-gnu_end.o: gnu_end.s
-
diff --git a/lib/gnu/end/Makefile.in b/lib/gnu/end/Makefile.in
new file mode 100644
index 000000000..bee2abf1c
--- /dev/null
+++ b/lib/gnu/end/Makefile.in
@@ -0,0 +1,7 @@
+
+LIBRARIES=end
+
+end_FILES=gnu_end.gs
+
+TYPE=gnu
+
diff --git a/lib/gnu/ieee_float/Makefile b/lib/gnu/ieee_float/Makefile
deleted file mode 100644
index e025178d9..000000000
--- a/lib/gnu/ieee_float/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-CFLAGS	= -O -I..
-
-LIBRARIES = libc
-
-libc_OBJECTS	= \
-	frexp.o \
-	isinf.o \
-	isnan.o \
-	ldexp.o \
-	modf.o \
-	fphook.o \
-
-include ../../Makefile.gnu.inc
diff --git a/lib/gnu/ieee_float/Makefile.gnu.conv b/lib/gnu/ieee_float/Makefile.gnu.conv
deleted file mode 100644
index 479c5fd26..000000000
--- a/lib/gnu/ieee_float/Makefile.gnu.conv
+++ /dev/null
@@ -1,58 +0,0 @@
-# Makefile for lib/ieee_float.
-
-#CC	= gcc
-#ARCH	= eniac
-CFLAGS	= -O -I$(SRCDIR)/stdio
-CC1	= $(CC) $(CFLAGS) -c
-
-LIBRARY	= ../../libc.a
-LIBSOFT	= ../../libsoft.a
-
-OBJECTS	= \
-	$(LIBRARY)(frexp.o) \
-	$(LIBRARY)(isinf.o) \
-	$(LIBRARY)(isnan.o) \
-	$(LIBRARY)(ldexp.o) \
-	$(LIBRARY)(modf.o) \
-	$(LIBRARY)(fphook.o) \
-
-all: $(LIBRARY)
-
-$(LIBRARY):	$(OBJECTS)
-	$(AR) cr $@ *.o
-
-$(LIBRARY)(frexp.o):	frexp.c
-$(LIBRARY)(isinf.o):	isinf.c
-$(LIBRARY)(isnan.o):	isnan.c
-$(LIBRARY)(ldexp.o):	ldexp.c
-$(LIBRARY)(modf.o):	modf.c
-$(LIBRARY)(fphook.o):	fphook.c
-SOFTOBJ	= \
-	$(LIBSOFT)(frexp.o) \
-	$(LIBSOFT)(isinf.o) \
-	$(LIBSOFT)(isnan.o) \
-	$(LIBSOFT)(ldexp.o) \
-	$(LIBSOFT)(modf.o) \
-
-soft:	$(LIBSOFT)
-
-$(LIBSOFT):	$(SOFTOBJ)
-	$(CC) -c.a -o $@ *.o
-	rm *.o
-
-$(LIBSOFT)(frexp.o):	frexp.c
-	$(CC1) -fsoft frexp.c
-
-$(LIBSOFT)(isinf.o):	isinf.c
-	$(CC1) -fsoft isinf.c
-
-$(LIBSOFT)(isnan.o):	isnan.c
-	$(CC1) -fsoft isnan.c
-
-$(LIBSOFT)(ldexp.o):	ldexp.c
-	$(CC1) -fsoft ldexp.c
-
-$(LIBSOFT)(modf.o):	modf.c
-	$(CC1) -fsoft modf.c
-
-# $PchId: Makefile,v 1.3 1996/02/22 21:01:39 philip Exp $
diff --git a/lib/gnu/ieee_float/Makefile.in b/lib/gnu/ieee_float/Makefile.in
new file mode 100644
index 000000000..82343dcef
--- /dev/null
+++ b/lib/gnu/ieee_float/Makefile.in
@@ -0,0 +1,14 @@
+
+CFLAGS="-O -I.."
+
+LIBRARIES=libc
+
+libc_FILES=" \
+	frexp.c \
+	isinf.c \
+	isnan.c \
+	ldexp.c \
+	modf.c \
+	fphook.c"
+
+TYPE=gnu
diff --git a/lib/gnu/rts/Makefile b/lib/gnu/rts/Makefile
deleted file mode 100644
index 492516961..000000000
--- a/lib/gnu/rts/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-
-LIBRARIES = libc
-
-libc_OBJECTS	= \
-	_longjmp.o \
-	_setjmp.o \
-	longjmp.o \
-	setjmp.o \
-
-include ../../Makefile.gnu.inc
diff --git a/lib/gnu/rts/Makefile.gnu b/lib/gnu/rts/Makefile.gnu
deleted file mode 100644
index 1dadbfe19..000000000
--- a/lib/gnu/rts/Makefile.gnu
+++ /dev/null
@@ -1,27 +0,0 @@
-CC=gcc
-AR=gar
-AS=gas
-
-VPATH=$(SRCDIR)/gnu/rts
-
-#Makefile for lib/gcc/mach/minix.i386/libsys.
-
-LIBRARY	= ../../libc.a
-
-OBJECTS	= \
-	_longjmp.o \
-	_setjmp.o \
-	longjmp.o \
-	setjmp.o \
-
-all: $(LIBRARY)
-
-$(LIBRARY):	$(OBJECTS)
-	$(AR) cr $@ *.o
-	
-_longjmp.o:	_longjmp.s
-_setjmp.o:	_setjmp.s
-longjmp.o:	longjmp.s
-setjmp.o:	setjmp.s
-
-# $PchId: Makefile,v 1.4 1996/02/22 21:54:11 philip Exp $
diff --git a/lib/gnu/rts/Makefile.in b/lib/gnu/rts/Makefile.in
new file mode 100644
index 000000000..cd5f8b364
--- /dev/null
+++ b/lib/gnu/rts/Makefile.in
@@ -0,0 +1,10 @@
+
+LIBRARIES=libc
+
+libc_FILES=" \
+	_longjmp.gs \
+	_setjmp.gs \
+	longjmp.gs \
+	setjmp.gs"
+
+TYPE=gnu
diff --git a/lib/i386/Makefile b/lib/i386/Makefile.in
old mode 100755
new mode 100644
similarity index 53%
rename from lib/i386/Makefile
rename to lib/i386/Makefile.in
index 95f7e3a72..4a8ed4e64
--- a/lib/i386/Makefile
+++ b/lib/i386/Makefile.in
@@ -1,9 +1,9 @@
 # Makefile for lib/i386.
 
-SUBDIRS = \
+SUBDIRS="\
 	int64 \
 	misc \
 	rts \
-	string
+	string"
 
-include ../Makefile.inc
+TYPE=both
diff --git a/lib/i386/em/Makefile b/lib/i386/em/Makefile
deleted file mode 100755
index bac9b638a..000000000
--- a/lib/i386/em/Makefile
+++ /dev/null
@@ -1,289 +0,0 @@
-# Makefile for lib/i386/em.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE -Was-ack
-CC1	= $(CC) $(CFLAGS) -c
-
-LIBRARY	= ../../libe.a
-all:	$(LIBRARY)
-
-OBJECTS	= \
-	$(LIBRARY)(em_adf4.o) \
-	$(LIBRARY)(em_adf8.o) \
-	$(LIBRARY)(em_adi.o) \
-	$(LIBRARY)(em_and.o) \
-	$(LIBRARY)(em_blm.o) \
-	$(LIBRARY)(em_cff4.o) \
-	$(LIBRARY)(em_cff8.o) \
-	$(LIBRARY)(em_cfi.o) \
-	$(LIBRARY)(em_cfu.o) \
-	$(LIBRARY)(em_cif4.o) \
-	$(LIBRARY)(em_cif8.o) \
-	$(LIBRARY)(em_cii.o) \
-	$(LIBRARY)(em_cmf4.o) \
-	$(LIBRARY)(em_cmf8.o) \
-	$(LIBRARY)(em_cms.o) \
-	$(LIBRARY)(em_com.o) \
-	$(LIBRARY)(em_csa4.o) \
-	$(LIBRARY)(em_csb4.o) \
-	$(LIBRARY)(em_cuf4.o) \
-	$(LIBRARY)(em_cuf8.o) \
-	$(LIBRARY)(em_cuu.o) \
-	$(LIBRARY)(em_dup.o) \
-	$(LIBRARY)(em_dvf4.o) \
-	$(LIBRARY)(em_dvf8.o) \
-	$(LIBRARY)(em_dvi.o) \
-	$(LIBRARY)(em_dvu.o) \
-	$(LIBRARY)(em_error.o) \
-	$(LIBRARY)(em_exg.o) \
-	$(LIBRARY)(em_fat.o) \
-	$(LIBRARY)(em_fef4.o) \
-	$(LIBRARY)(em_fef8.o) \
-	$(LIBRARY)(em_fif4.o) \
-	$(LIBRARY)(em_fif8.o) \
-	$(LIBRARY)(em_fp8087.o) \
-	$(LIBRARY)(em_gto.o) \
-	$(LIBRARY)(em_hol0.o) \
-	$(LIBRARY)(em_iaar.o) \
-	$(LIBRARY)(em_ilar.o) \
-	$(LIBRARY)(em_inn.o) \
-	$(LIBRARY)(em_ior.o) \
-	$(LIBRARY)(em_isar.o) \
-	$(LIBRARY)(em_lar4.o) \
-	$(LIBRARY)(em_loi.o) \
-	$(LIBRARY)(em_mlf4.o) \
-	$(LIBRARY)(em_mlf8.o) \
-	$(LIBRARY)(em_mli.o) \
-	$(LIBRARY)(em_mon.o) \
-	$(LIBRARY)(em_ngf4.o) \
-	$(LIBRARY)(em_ngf8.o) \
-	$(LIBRARY)(em_ngi.o) \
-	$(LIBRARY)(em_nop.o) \
-	$(LIBRARY)(em_print.o) \
-	$(LIBRARY)(em_rck.o) \
-	$(LIBRARY)(em_rmi.o) \
-	$(LIBRARY)(em_rmu.o) \
-	$(LIBRARY)(em_rol.o) \
-	$(LIBRARY)(em_ror.o) \
-	$(LIBRARY)(em_sar4.o) \
-	$(LIBRARY)(em_sbf4.o) \
-	$(LIBRARY)(em_sbf8.o) \
-	$(LIBRARY)(em_sbi.o) \
-	$(LIBRARY)(em_set.o) \
-	$(LIBRARY)(em_sli.o) \
-	$(LIBRARY)(em_sri.o) \
-	$(LIBRARY)(em_sti.o) \
-	$(LIBRARY)(em_stop.o) \
-	$(LIBRARY)(em_trp.o) \
-	$(LIBRARY)(em_unknown.o) \
-	$(LIBRARY)(em_xor.o) \
-
-$(LIBRARY):	$(OBJECTS)
-	aal cr $@ *.o
-	rm *.o
-
-$(LIBRARY)(em_adf4.o):	em_adf4.s
-	$(CC1) em_adf4.s
-
-$(LIBRARY)(em_adf8.o):	em_adf8.s
-	$(CC1) em_adf8.s
-
-$(LIBRARY)(em_adi.o):	em_adi.s
-	$(CC1) em_adi.s
-
-$(LIBRARY)(em_and.o):	em_and.s
-	$(CC1) em_and.s
-
-$(LIBRARY)(em_blm.o):	em_blm.s
-	$(CC1) em_blm.s
-
-$(LIBRARY)(em_cff4.o):	em_cff4.s
-	$(CC1) em_cff4.s
-
-$(LIBRARY)(em_cff8.o):	em_cff8.s
-	$(CC1) em_cff8.s
-
-$(LIBRARY)(em_cfi.o):	em_cfi.s
-	$(CC1) em_cfi.s
-
-$(LIBRARY)(em_cfu.o):	em_cfu.s
-	$(CC1) em_cfu.s
-
-$(LIBRARY)(em_cif4.o):	em_cif4.s
-	$(CC1) em_cif4.s
-
-$(LIBRARY)(em_cif8.o):	em_cif8.s
-	$(CC1) em_cif8.s
-
-$(LIBRARY)(em_cii.o):	em_cii.s
-	$(CC1) em_cii.s
-
-$(LIBRARY)(em_cmf4.o):	em_cmf4.s
-	$(CC1) em_cmf4.s
-
-$(LIBRARY)(em_cmf8.o):	em_cmf8.s
-	$(CC1) em_cmf8.s
-
-$(LIBRARY)(em_cms.o):	em_cms.s
-	$(CC1) em_cms.s
-
-$(LIBRARY)(em_com.o):	em_com.s
-	$(CC1) em_com.s
-
-$(LIBRARY)(em_csa4.o):	em_csa4.s
-	$(CC1) em_csa4.s
-
-$(LIBRARY)(em_csb4.o):	em_csb4.s
-	$(CC1) em_csb4.s
-
-$(LIBRARY)(em_cuf4.o):	em_cuf4.s
-	$(CC1) em_cuf4.s
-
-$(LIBRARY)(em_cuf8.o):	em_cuf8.s
-	$(CC1) em_cuf8.s
-
-$(LIBRARY)(em_cuu.o):	em_cuu.s
-	$(CC1) em_cuu.s
-
-$(LIBRARY)(em_dup.o):	em_dup.s
-	$(CC1) em_dup.s
-
-$(LIBRARY)(em_dvf4.o):	em_dvf4.s
-	$(CC1) em_dvf4.s
-
-$(LIBRARY)(em_dvf8.o):	em_dvf8.s
-	$(CC1) em_dvf8.s
-
-$(LIBRARY)(em_dvi.o):	em_dvi.s
-	$(CC1) em_dvi.s
-
-$(LIBRARY)(em_dvu.o):	em_dvu.s
-	$(CC1) em_dvu.s
-
-$(LIBRARY)(em_error.o):	em_error.s
-	$(CC1) em_error.s
-
-$(LIBRARY)(em_exg.o):	em_exg.s
-	$(CC1) em_exg.s
-
-$(LIBRARY)(em_fat.o):	em_fat.s
-	$(CC1) em_fat.s
-
-$(LIBRARY)(em_fef4.o):	em_fef4.s
-	$(CC1) em_fef4.s
-
-$(LIBRARY)(em_fef8.o):	em_fef8.s
-	$(CC1) em_fef8.s
-
-$(LIBRARY)(em_fif4.o):	em_fif4.s
-	$(CC1) em_fif4.s
-
-$(LIBRARY)(em_fif8.o):	em_fif8.s
-	$(CC1) em_fif8.s
-
-$(LIBRARY)(em_fp8087.o):	em_fp8087.s
-	$(CC1) em_fp8087.s
-
-$(LIBRARY)(em_gto.o):	em_gto.s
-	$(CC1) em_gto.s
-
-$(LIBRARY)(em_hol0.o):	em_hol0.s
-	$(CC1) em_hol0.s
-
-$(LIBRARY)(em_iaar.o):	em_iaar.s
-	$(CC1) em_iaar.s
-
-$(LIBRARY)(em_ilar.o):	em_ilar.s
-	$(CC1) em_ilar.s
-
-$(LIBRARY)(em_inn.o):	em_inn.s
-	$(CC1) em_inn.s
-
-$(LIBRARY)(em_ior.o):	em_ior.s
-	$(CC1) em_ior.s
-
-$(LIBRARY)(em_isar.o):	em_isar.s
-	$(CC1) em_isar.s
-
-$(LIBRARY)(em_lar4.o):	em_lar4.s
-	$(CC1) em_lar4.s
-
-$(LIBRARY)(em_loi.o):	em_loi.s
-	$(CC1) em_loi.s
-
-$(LIBRARY)(em_mlf4.o):	em_mlf4.s
-	$(CC1) em_mlf4.s
-
-$(LIBRARY)(em_mlf8.o):	em_mlf8.s
-	$(CC1) em_mlf8.s
-
-$(LIBRARY)(em_mli.o):	em_mli.s
-	$(CC1) em_mli.s
-
-$(LIBRARY)(em_mon.o):	em_mon.s
-	$(CC1) em_mon.s
-
-$(LIBRARY)(em_ngf4.o):	em_ngf4.s
-	$(CC1) em_ngf4.s
-
-$(LIBRARY)(em_ngf8.o):	em_ngf8.s
-	$(CC1) em_ngf8.s
-
-$(LIBRARY)(em_ngi.o):	em_ngi.s
-	$(CC1) em_ngi.s
-
-$(LIBRARY)(em_nop.o):	em_nop.s
-	$(CC1) em_nop.s
-
-$(LIBRARY)(em_print.o):	em_print.s
-	$(CC1) em_print.s
-
-$(LIBRARY)(em_rck.o):	em_rck.s
-	$(CC1) em_rck.s
-
-$(LIBRARY)(em_rmi.o):	em_rmi.s
-	$(CC1) em_rmi.s
-
-$(LIBRARY)(em_rmu.o):	em_rmu.s
-	$(CC1) em_rmu.s
-
-$(LIBRARY)(em_rol.o):	em_rol.s
-	$(CC1) em_rol.s
-
-$(LIBRARY)(em_ror.o):	em_ror.s
-	$(CC1) em_ror.s
-
-$(LIBRARY)(em_sar4.o):	em_sar4.s
-	$(CC1) em_sar4.s
-
-$(LIBRARY)(em_sbf4.o):	em_sbf4.s
-	$(CC1) em_sbf4.s
-
-$(LIBRARY)(em_sbf8.o):	em_sbf8.s
-	$(CC1) em_sbf8.s
-
-$(LIBRARY)(em_sbi.o):	em_sbi.s
-	$(CC1) em_sbi.s
-
-$(LIBRARY)(em_set.o):	em_set.s
-	$(CC1) em_set.s
-
-$(LIBRARY)(em_sli.o):	em_sli.s
-	$(CC1) em_sli.s
-
-$(LIBRARY)(em_sri.o):	em_sri.s
-	$(CC1) em_sri.s
-
-$(LIBRARY)(em_sti.o):	em_sti.s
-	$(CC1) em_sti.s
-
-$(LIBRARY)(em_stop.o):	em_stop.s
-	$(CC1) em_stop.s
-
-$(LIBRARY)(em_trp.o):	em_trp.s
-	$(CC1) em_trp.s
-
-$(LIBRARY)(em_unknown.o):	em_unknown.s
-	$(CC1) em_unknown.s
-
-$(LIBRARY)(em_xor.o):	em_xor.s
-	$(CC1) em_xor.s
diff --git a/lib/i386/head/Makefile b/lib/i386/head/Makefile
deleted file mode 100755
index e18d65829..000000000
--- a/lib/i386/head/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# Makefile for lib/i386/head.
-
-CC1	= $(CC) -Was-ack -c
-
-LIBRARY	= ../../libe.a
-all:	$(LIBRARY)
-
-$(LIBRARY):	$(LIBRARY)(em_head.o)
-	aal cr $@ *.o
-	rm *.o
-
-$(LIBRARY)(em_head.o):	em_head.s
-	$(CC1) -I. em_head.s
diff --git a/lib/i386/int64/Makefile b/lib/i386/int64/Makefile
deleted file mode 100755
index 41447f113..000000000
--- a/lib/i386/int64/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for lib/i386/int64.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE
-
-LIBRARIES = libc
-
-libc_OBJECTS	= \
-	add64.o \
-	add64u.o \
-	cmp64.o \
-	cv64u.o \
-	cvu64.o \
-	diff64.o \
-	div64u.o \
-	ex64.o \
-	make64.o \
-	mul64u.o \
-	sub64.o \
-	sub64u.o \
-
-include ../../Makefile.inc
diff --git a/lib/i386/int64/Makefile.in b/lib/i386/int64/Makefile.in
new file mode 100644
index 000000000..0882e125b
--- /dev/null
+++ b/lib/i386/int64/Makefile.in
@@ -0,0 +1,21 @@
+# Makefile for lib/i386/int64.
+
+CFLAGS="-O -D_MINIX -D_POSIX_SOURCE"
+
+LIBRARIES=libc
+
+libc_FILES=" \
+	add64.s \
+	add64u.s \
+	cmp64.s \
+	cv64u.s \
+	cvu64.s \
+	diff64.s \
+	div64u.s \
+	ex64.s \
+	make64.s \
+	mul64u.s \
+	sub64.s \
+	sub64u.s"
+
+TYPE=both
diff --git a/lib/i386/misc/Makefile b/lib/i386/misc/Makefile
deleted file mode 100755
index 4442833b6..000000000
--- a/lib/i386/misc/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Makefile for lib/i386/misc.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE
-
-LIBRARIES = libc
-
-libc_OBJECTS	= \
-	alloca.o \
-	get_bp.o \
-	getprocessor.o \
-	io_inb.o \
-	io_inl.o \
-	io_insb.o \
-	io_insl.o \
-	io_insw.o \
-	io_intr.o \
-	io_inw.o \
-	io_outb.o \
-	io_outl.o \
-	io_outsb.o \
-	io_outsl.o \
-	io_outsw.o \
-	io_outw.o \
-	oneC_sum.o \
-
-include ../../Makefile.inc
diff --git a/lib/i386/misc/Makefile.in b/lib/i386/misc/Makefile.in
new file mode 100644
index 000000000..511524f08
--- /dev/null
+++ b/lib/i386/misc/Makefile.in
@@ -0,0 +1,26 @@
+# Makefile for lib/i386/misc.
+
+CFLAGS="-O -D_MINIX -D_POSIX_SOURCE"
+
+LIBRARIES=libc
+
+libc_FILES=" \
+	alloca.s \
+	get_bp.s \
+	getprocessor.s \
+	io_inb.s \
+	io_inl.s \
+	io_insb.s \
+	io_insl.s \
+	io_insw.s \
+	io_intr.s \
+	io_inw.s \
+	io_outb.s \
+	io_outl.s \
+	io_outsb.s \
+	io_outsl.s \
+	io_outsw.s \
+	io_outw.s \
+	oneC_sum.s"
+
+TYPE=both
diff --git a/lib/i386/rts/Makefile b/lib/i386/rts/Makefile
deleted file mode 100755
index 9c978d143..000000000
--- a/lib/i386/rts/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Makefile for lib/i386/rts.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE
-
-LIBRARIES = libc
-
-libc_OBJECTS	= \
-	__sigreturn.o \
-	_ipc.o \
-	brksize.o \
-	
-TOPLEVEL_OBJECTS = \
-	crtso.o \
-	m2rtso.o \
-	prtso.o \
-
-include ../../Makefile.inc
diff --git a/lib/i386/rts/Makefile.in b/lib/i386/rts/Makefile.in
new file mode 100644
index 000000000..979dc8faa
--- /dev/null
+++ b/lib/i386/rts/Makefile.in
@@ -0,0 +1,17 @@
+# Makefile for lib/i386/rts.
+
+CFLAGS="-O -D_MINIX -D_POSIX_SOURCE"
+
+LIBRARIES=libc
+
+libc_FILES=" \
+	__sigreturn.s \
+	_ipc.s \
+	brksize.s"
+	
+STARTFILES="\
+	crtso.s \
+	m2rtso.s \
+	prtso.s"
+
+TYPE=both
diff --git a/lib/i386/string/Makefile b/lib/i386/string/Makefile
deleted file mode 100755
index 1dc7479f8..000000000
--- a/lib/i386/string/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# Makefile for lib/i386/string.
-
-LIBRARIES = libc
-
-libc_OBJECTS	= \
-	_memmove.o \
-	_strncat.o \
-	_strncmp.o \
-	_strncpy.o \
-	_strnlen.o \
-	bcmp.o \
-	bcopy.o \
-	bzero.o \
-	index.o \
-	memchr.o \
-	memcmp.o \
-	memcpy.o \
-	memmove.o \
-	memset.o \
-	rindex.o \
-	strcat.o \
-	strchr.o \
-	strcmp.o \
-	strcpy.o \
-	strlen.o \
-	strncat.o \
-	strncmp.o \
-	strncpy.o \
-	strnlen.o \
-	strrchr.o \
-
-include ../../Makefile.inc
diff --git a/lib/i386/string/Makefile.in b/lib/i386/string/Makefile.in
new file mode 100644
index 000000000..e7e26c883
--- /dev/null
+++ b/lib/i386/string/Makefile.in
@@ -0,0 +1,32 @@
+# Makefile for lib/i386/string.
+
+LIBRARIES=libc
+
+libc_FILES=" \
+	_memmove.s \
+	_strncat.s \
+	_strncmp.s \
+	_strncpy.s \
+	_strnlen.s \
+	bcmp.s \
+	bcopy.s \
+	bzero.s \
+	index.s \
+	memchr.s \
+	memcmp.s \
+	memcpy.s \
+	memmove.s \
+	memset.s \
+	rindex.s \
+	strcat.s \
+	strchr.s \
+	strcmp.s \
+	strcpy.s \
+	strlen.s \
+	strncat.s \
+	strncmp.s \
+	strncpy.s \
+	strnlen.s \
+	strrchr.s"
+
+TYPE=both
diff --git a/lib/i86/Makefile b/lib/i86/Makefile
deleted file mode 100755
index dc1d7f876..000000000
--- a/lib/i86/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Makefile for lib/i86.
-
-MAKE	= exec make -$(MAKEFLAGS)
-
-install:
-	cd em && $(MAKE)
-	cd int64 && $(MAKE)
-	cd misc && $(MAKE)
-	cd rts && $(MAKE)
-	cd string && $(MAKE)
diff --git a/lib/i86/em/Makefile b/lib/i86/em/Makefile
deleted file mode 100755
index c415a1605..000000000
--- a/lib/i86/em/Makefile
+++ /dev/null
@@ -1,217 +0,0 @@
-# Makefile for lib/i86/em.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE -Was-ncc
-CC1	= $(CC) $(CFLAGS) -c
-
-LIBRARY	= ../../libe.a
-all:	$(LIBRARY)
-
-OBJECTS	= \
-	$(LIBRARY)(em_adi.o) \
-	$(LIBRARY)(em_and.o) \
-	$(LIBRARY)(em_blm.o) \
-	$(LIBRARY)(em_cii.o) \
-	$(LIBRARY)(em_cmi4.o) \
-	$(LIBRARY)(em_cms.o) \
-	$(LIBRARY)(em_cmu4.o) \
-	$(LIBRARY)(em_com.o) \
-	$(LIBRARY)(em_csa2.o) \
-	$(LIBRARY)(em_csa4.o) \
-	$(LIBRARY)(em_csb2.o) \
-	$(LIBRARY)(em_csb4.o) \
-	$(LIBRARY)(em_cuu.o) \
-	$(LIBRARY)(em_dup.o) \
-	$(LIBRARY)(em_dvi4.o) \
-	$(LIBRARY)(em_dvu4.o) \
-	$(LIBRARY)(em_error.o) \
-	$(LIBRARY)(em_exg.o) \
-	$(LIBRARY)(em_fat.o) \
-	$(LIBRARY)(em_fp8087.o) \
-	$(LIBRARY)(em_gto.o) \
-	$(LIBRARY)(em_hol0.o) \
-	$(LIBRARY)(em_iaar.o) \
-	$(LIBRARY)(em_ilar.o) \
-	$(LIBRARY)(em_inn.o) \
-	$(LIBRARY)(em_ior.o) \
-	$(LIBRARY)(em_isar.o) \
-	$(LIBRARY)(em_lar2.o) \
-	$(LIBRARY)(em_lfr6.o) \
-	$(LIBRARY)(em_lfr8.o) \
-	$(LIBRARY)(em_loi.o) \
-	$(LIBRARY)(em_mli4.o) \
-	$(LIBRARY)(em_mon.o) \
-	$(LIBRARY)(em_nop.o) \
-	$(LIBRARY)(em_rck.o) \
-	$(LIBRARY)(em_ret6.o) \
-	$(LIBRARY)(em_ret8.o) \
-	$(LIBRARY)(em_retarea.o) \
-	$(LIBRARY)(em_return.o) \
-	$(LIBRARY)(em_rmi4.o) \
-	$(LIBRARY)(em_rmu4.o) \
-	$(LIBRARY)(em_sar2.o) \
-	$(LIBRARY)(em_sbi.o) \
-	$(LIBRARY)(em_set.o) \
-	$(LIBRARY)(em_stb.o) \
-	$(LIBRARY)(em_sti.o) \
-	$(LIBRARY)(em_stop.o) \
-	$(LIBRARY)(em_trp.o) \
-	$(LIBRARY)(em_unknown.o) \
-	$(LIBRARY)(em_vars.o) \
-	$(LIBRARY)(em_xor.o) \
-
-$(LIBRARY):	$(OBJECTS)
-	aal cr $@ *.o
-	rm *.o
-
-$(LIBRARY)(em_adi.o):	em_adi.s
-	$(CC1) em_adi.s
-
-$(LIBRARY)(em_and.o):	em_and.s
-	$(CC1) em_and.s
-
-$(LIBRARY)(em_blm.o):	em_blm.s
-	$(CC1) em_blm.s
-
-$(LIBRARY)(em_cii.o):	em_cii.s
-	$(CC1) em_cii.s
-
-$(LIBRARY)(em_cmi4.o):	em_cmi4.s
-	$(CC1) em_cmi4.s
-
-$(LIBRARY)(em_cms.o):	em_cms.s
-	$(CC1) em_cms.s
-
-$(LIBRARY)(em_cmu4.o):	em_cmu4.s
-	$(CC1) em_cmu4.s
-
-$(LIBRARY)(em_com.o):	em_com.s
-	$(CC1) em_com.s
-
-$(LIBRARY)(em_csa2.o):	em_csa2.s
-	$(CC1) em_csa2.s
-
-$(LIBRARY)(em_csa4.o):	em_csa4.s
-	$(CC1) em_csa4.s
-
-$(LIBRARY)(em_csb2.o):	em_csb2.s
-	$(CC1) em_csb2.s
-
-$(LIBRARY)(em_csb4.o):	em_csb4.s
-	$(CC1) em_csb4.s
-
-$(LIBRARY)(em_cuu.o):	em_cuu.s
-	$(CC1) em_cuu.s
-
-$(LIBRARY)(em_dup.o):	em_dup.s
-	$(CC1) em_dup.s
-
-$(LIBRARY)(em_dvi4.o):	em_dvi4.s
-	$(CC1) em_dvi4.s
-
-$(LIBRARY)(em_dvu4.o):	em_dvu4.s
-	$(CC1) em_dvu4.s
-
-$(LIBRARY)(em_error.o):	em_error.s
-	$(CC1) em_error.s
-
-$(LIBRARY)(em_exg.o):	em_exg.s
-	$(CC1) em_exg.s
-
-$(LIBRARY)(em_fat.o):	em_fat.s
-	$(CC1) em_fat.s
-
-$(LIBRARY)(em_fp8087.o):	em_fp8087.s
-	$(CC1) em_fp8087.s
-
-$(LIBRARY)(em_gto.o):	em_gto.s
-	$(CC1) em_gto.s
-
-$(LIBRARY)(em_hol0.o):	em_hol0.s
-	$(CC1) em_hol0.s
-
-$(LIBRARY)(em_iaar.o):	em_iaar.s
-	$(CC1) em_iaar.s
-
-$(LIBRARY)(em_ilar.o):	em_ilar.s
-	$(CC1) em_ilar.s
-
-$(LIBRARY)(em_inn.o):	em_inn.s
-	$(CC1) em_inn.s
-
-$(LIBRARY)(em_ior.o):	em_ior.s
-	$(CC1) em_ior.s
-
-$(LIBRARY)(em_isar.o):	em_isar.s
-	$(CC1) em_isar.s
-
-$(LIBRARY)(em_lar2.o):	em_lar2.s
-	$(CC1) em_lar2.s
-
-$(LIBRARY)(em_lfr6.o):	em_lfr6.s
-	$(CC1) em_lfr6.s
-
-$(LIBRARY)(em_lfr8.o):	em_lfr8.s
-	$(CC1) em_lfr8.s
-
-$(LIBRARY)(em_loi.o):	em_loi.s
-	$(CC1) em_loi.s
-
-$(LIBRARY)(em_mli4.o):	em_mli4.s
-	$(CC1) em_mli4.s
-
-$(LIBRARY)(em_mon.o):	em_mon.s
-	$(CC1) em_mon.s
-
-$(LIBRARY)(em_nop.o):	em_nop.s
-	$(CC1) em_nop.s
-
-$(LIBRARY)(em_rck.o):	em_rck.s
-	$(CC1) em_rck.s
-
-$(LIBRARY)(em_ret6.o):	em_ret6.s
-	$(CC1) em_ret6.s
-
-$(LIBRARY)(em_ret8.o):	em_ret8.s
-	$(CC1) em_ret8.s
-
-$(LIBRARY)(em_retarea.o):	em_retarea.s
-	$(CC1) em_retarea.s
-
-$(LIBRARY)(em_return.o):	em_return.s
-	$(CC1) em_return.s
-
-$(LIBRARY)(em_rmi4.o):	em_rmi4.s
-	$(CC1) em_rmi4.s
-
-$(LIBRARY)(em_rmu4.o):	em_rmu4.s
-	$(CC1) em_rmu4.s
-
-$(LIBRARY)(em_sar2.o):	em_sar2.s
-	$(CC1) em_sar2.s
-
-$(LIBRARY)(em_sbi.o):	em_sbi.s
-	$(CC1) em_sbi.s
-
-$(LIBRARY)(em_set.o):	em_set.s
-	$(CC1) em_set.s
-
-$(LIBRARY)(em_stb.o):	em_stb.s
-	$(CC1) em_stb.s
-
-$(LIBRARY)(em_sti.o):	em_sti.s
-	$(CC1) em_sti.s
-
-$(LIBRARY)(em_stop.o):	em_stop.s
-	$(CC1) em_stop.s
-
-$(LIBRARY)(em_trp.o):	em_trp.s
-	$(CC1) em_trp.s
-
-$(LIBRARY)(em_unknown.o):	em_unknown.s
-	$(CC1) em_unknown.s
-
-$(LIBRARY)(em_vars.o):	em_vars.s
-	$(CC1) em_vars.s
-
-$(LIBRARY)(em_xor.o):	em_xor.s
-	$(CC1) em_xor.s
diff --git a/lib/i86/int64/Makefile b/lib/i86/int64/Makefile
deleted file mode 100755
index 70db03d67..000000000
--- a/lib/i86/int64/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# Makefile for lib/i386/int64.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE -Was-ncc
-CC1	= $(CC) $(CFLAGS) -c
-
-LIBRARY	= ../../libc.a
-all:	$(LIBRARY)
-
-OBJECTS	= \
-	$(LIBRARY)(add64.o) \
-	$(LIBRARY)(add64u.o) \
-	$(LIBRARY)(cmp64.o) \
-	$(LIBRARY)(cv64u.o) \
-	$(LIBRARY)(cvu64.o) \
-	$(LIBRARY)(diff64.o) \
-	$(LIBRARY)(div64u.o) \
-	$(LIBRARY)(ex64.o) \
-	$(LIBRARY)(make64.o) \
-	$(LIBRARY)(mul64u.o) \
-	$(LIBRARY)(sub64.o) \
-	$(LIBRARY)(sub64u.o) \
-
-$(LIBRARY):	$(OBJECTS)
-	aal cr $@ *.o
-	rm *.o
-
-$(LIBRARY)(add64.o):	add64.s
-	$(CC1) add64.s
-
-$(LIBRARY)(add64u.o):	add64u.s
-	$(CC1) add64u.s
-
-$(LIBRARY)(cmp64.o):	cmp64.s
-	$(CC1) cmp64.s
-
-$(LIBRARY)(cv64u.o):	cv64u.s
-	$(CC1) cv64u.s
-
-$(LIBRARY)(cvu64.o):	cvu64.s
-	$(CC1) cvu64.s
-
-$(LIBRARY)(diff64.o):	diff64.s
-	$(CC1) diff64.s
-
-$(LIBRARY)(div64u.o):	div64u.s
-	$(CC1) div64u.s
-
-$(LIBRARY)(ex64.o):	ex64.s
-	$(CC1) ex64.s
-
-$(LIBRARY)(make64.o):	make64.s
-	$(CC1) make64.s
-
-$(LIBRARY)(mul64u.o):	mul64u.s
-	$(CC1) mul64u.s
-
-$(LIBRARY)(sub64.o):	sub64.s
-	$(CC1) sub64.s
-
-$(LIBRARY)(sub64u.o):	sub64u.s
-	$(CC1) sub64u.s
diff --git a/lib/i86/misc/Makefile b/lib/i86/misc/Makefile
deleted file mode 100755
index 8b7f73618..000000000
--- a/lib/i86/misc/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# Makefile for lib/i86/misc.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE -Was-ncc
-CC1	= $(CC) $(CFLAGS) -c
-
-LIBRARY	= ../../libc.a
-all:	$(LIBRARY)
-
-OBJECTS	= \
-	$(LIBRARY)(alloca.o) \
-	$(LIBRARY)(get_bp.o) \
-	$(LIBRARY)(getprocessor.o) \
-	$(LIBRARY)(hton86.o) \
-	$(LIBRARY)(io_inb.o) \
-	$(LIBRARY)(io_inl.o) \
-	$(LIBRARY)(io_insb.o) \
-	$(LIBRARY)(io_insl.o) \
-	$(LIBRARY)(io_insw.o) \
-	$(LIBRARY)(io_intr.o) \
-	$(LIBRARY)(io_inw.o) \
-	$(LIBRARY)(io_outb.o) \
-	$(LIBRARY)(io_outl.o) \
-	$(LIBRARY)(io_outsb.o) \
-	$(LIBRARY)(io_outsl.o) \
-	$(LIBRARY)(io_outsw.o) \
-	$(LIBRARY)(io_outw.o) \
-	$(LIBRARY)(oneC_sum.o) \
-
-$(LIBRARY):	$(OBJECTS)
-	aal cr $@ *.o
-	rm *.o
-
-$(LIBRARY)(alloca.o):	alloca.s
-	$(CC1) alloca.s
-
-$(LIBRARY)(get_bp.o):	get_bp.s
-	$(CC1) get_bp.s
-
-$(LIBRARY)(getprocessor.o):	getprocessor.s
-	$(CC1) getprocessor.s
-
-$(LIBRARY)(hton86.o):	hton86.s
-	$(CC1) hton86.s
-
-$(LIBRARY)(io_inb.o):	io_inb.s
-	$(CC1) io_inb.s
-
-$(LIBRARY)(io_inl.o):	io_inl.s
-	$(CC1) io_inl.s
-
-$(LIBRARY)(io_insb.o):	io_insb.s
-	$(CC1) io_insb.s
-
-$(LIBRARY)(io_insl.o):	io_insl.s
-	$(CC1) io_insl.s
-
-$(LIBRARY)(io_insw.o):	io_insw.s
-	$(CC1) io_insw.s
-
-$(LIBRARY)(io_intr.o):	io_intr.s
-	$(CC1) io_intr.s
-
-$(LIBRARY)(io_inw.o):	io_inw.s
-	$(CC1) io_inw.s
-
-$(LIBRARY)(io_outb.o):	io_outb.s
-	$(CC1) io_outb.s
-
-$(LIBRARY)(io_outl.o):	io_outl.s
-	$(CC1) io_outl.s
-
-$(LIBRARY)(io_outsb.o):	io_outsb.s
-	$(CC1) io_outsb.s
-
-$(LIBRARY)(io_outsl.o):	io_outsl.s
-	$(CC1) io_outsl.s
-
-$(LIBRARY)(io_outsw.o):	io_outsw.s
-	$(CC1) io_outsw.s
-
-$(LIBRARY)(io_outw.o):	io_outw.s
-	$(CC1) io_outw.s
-
-$(LIBRARY)(oneC_sum.o):	oneC_sum.s
-	$(CC1) oneC_sum.s
diff --git a/lib/i86/rts/Makefile b/lib/i86/rts/Makefile
deleted file mode 100755
index 2e9d18701..000000000
--- a/lib/i86/rts/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# Makefile for lib/i86/rts.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE -Was-ncc
-CC1	= $(CC) $(CFLAGS) -c
-
-LIBRARY	= ../../libc.a
-
-all:	\
-	../../ncrtso.o \
-	../../nm2rtso.o \
-	../../nprtso.o \
-	$(LIBRARY)
-
-../../ncrtso.o:	ncrtso.s
-	$(CC1) -c ncrtso.s
-	mv ncrtso.o $@
-
-../../nm2rtso.o:	nm2rtso.s
-	$(CC1) -c nm2rtso.s
-	mv nm2rtso.o $@
-
-../../nprtso.o:	nprtso.s
-	$(CC1) -c nprtso.s
-	mv nprtso.o $@
-
-OBJECTS	= \
-	$(LIBRARY)(__sigreturn.o) \
-	$(LIBRARY)(_sendrec.o) \
-	$(LIBRARY)(brksize.o) \
-
-$(LIBRARY):	$(OBJECTS)
-	aal cr $@ *.o
-	rm *.o
-
-$(LIBRARY)(__sigreturn.o):	__sigreturn.s
-	$(CC1) __sigreturn.s
-
-$(LIBRARY)(_sendrec.o):	_sendrec.s
-	$(CC1) _sendrec.s
-
-$(LIBRARY)(brksize.o):	brksize.s
-	$(CC1) brksize.s
diff --git a/lib/i86/string/Makefile b/lib/i86/string/Makefile
deleted file mode 100755
index 762105431..000000000
--- a/lib/i86/string/Makefile
+++ /dev/null
@@ -1,112 +0,0 @@
-# Makefile for lib/i86/string.
-
-CC1	= $(CC) -Was-ncc -c
-
-LIBRARY	= ../../libc.a
-all:	$(LIBRARY)
-
-OBJECTS	= \
-	$(LIBRARY)(_memmove.o) \
-	$(LIBRARY)(_strncat.o) \
-	$(LIBRARY)(_strncmp.o) \
-	$(LIBRARY)(_strncpy.o) \
-	$(LIBRARY)(_strnlen.o) \
-	$(LIBRARY)(bcmp.o) \
-	$(LIBRARY)(bcopy.o) \
-	$(LIBRARY)(bzero.o) \
-	$(LIBRARY)(index.o) \
-	$(LIBRARY)(memchr.o) \
-	$(LIBRARY)(memcmp.o) \
-	$(LIBRARY)(memcpy.o) \
-	$(LIBRARY)(memmove.o) \
-	$(LIBRARY)(memset.o) \
-	$(LIBRARY)(rindex.o) \
-	$(LIBRARY)(strcat.o) \
-	$(LIBRARY)(strchr.o) \
-	$(LIBRARY)(strcmp.o) \
-	$(LIBRARY)(strcpy.o) \
-	$(LIBRARY)(strlen.o) \
-	$(LIBRARY)(strncat.o) \
-	$(LIBRARY)(strncmp.o) \
-	$(LIBRARY)(strncpy.o) \
-	$(LIBRARY)(strnlen.o) \
-	$(LIBRARY)(strrchr.o) \
-
-$(LIBRARY):	$(OBJECTS)
-	aal cr $@ *.o
-	rm *.o
-
-$(LIBRARY)(_memmove.o):	_memmove.s
-	$(CC1) _memmove.s
-
-$(LIBRARY)(_strncat.o):	_strncat.s
-	$(CC1) _strncat.s
-
-$(LIBRARY)(_strncmp.o):	_strncmp.s
-	$(CC1) _strncmp.s
-
-$(LIBRARY)(_strncpy.o):	_strncpy.s
-	$(CC1) _strncpy.s
-
-$(LIBRARY)(_strnlen.o):	_strnlen.s
-	$(CC1) _strnlen.s
-
-$(LIBRARY)(bcmp.o):	bcmp.s
-	$(CC1) bcmp.s
-
-$(LIBRARY)(bcopy.o):	bcopy.s
-	$(CC1) bcopy.s
-
-$(LIBRARY)(bzero.o):	bzero.s
-	$(CC1) bzero.s
-
-$(LIBRARY)(index.o):	index.s
-	$(CC1) index.s
-
-$(LIBRARY)(memchr.o):	memchr.s
-	$(CC1) memchr.s
-
-$(LIBRARY)(memcmp.o):	memcmp.s
-	$(CC1) memcmp.s
-
-$(LIBRARY)(memcpy.o):	memcpy.s
-	$(CC1) memcpy.s
-
-$(LIBRARY)(memmove.o):	memmove.s
-	$(CC1) memmove.s
-
-$(LIBRARY)(memset.o):	memset.s
-	$(CC1) memset.s
-
-$(LIBRARY)(rindex.o):	rindex.s
-	$(CC1) rindex.s
-
-$(LIBRARY)(strcat.o):	strcat.s
-	$(CC1) strcat.s
-
-$(LIBRARY)(strchr.o):	strchr.s
-	$(CC1) strchr.s
-
-$(LIBRARY)(strcmp.o):	strcmp.s
-	$(CC1) strcmp.s
-
-$(LIBRARY)(strcpy.o):	strcpy.s
-	$(CC1) strcpy.s
-
-$(LIBRARY)(strlen.o):	strlen.s
-	$(CC1) strlen.s
-
-$(LIBRARY)(strncat.o):	strncat.s
-	$(CC1) strncat.s
-
-$(LIBRARY)(strncmp.o):	strncmp.s
-	$(CC1) strncmp.s
-
-$(LIBRARY)(strncpy.o):	strncpy.s
-	$(CC1) strncpy.s
-
-$(LIBRARY)(strnlen.o):	strnlen.s
-	$(CC1) strnlen.s
-
-$(LIBRARY)(strrchr.o):	strrchr.s
-	$(CC1) strrchr.s
diff --git a/lib/ip/Makefile b/lib/ip/Makefile
deleted file mode 100755
index 64235eb3f..000000000
--- a/lib/ip/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# Makefile for lib/ip.
-#
-# Note: The oneC_sum.c file is not used if there is an assembly equivalent.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE -I. -DNDEBUG
-
-LIBRARIES = libc
-
-libc_OBJECTS	= \
-	accept.o \
-	bind.o \
-	connect.o \
-	dhcp_gettag.o \
-	dhcp_settag.o \
-	ether_line.o \
-	ethera2n.o \
-	ethere2a.o \
-	etherh2n.o \
-	ethern2h.o \
-	getdomain.o \
-	gethnmadr.o \
-	gethostent.o \
-	gethostname.o \
-	getnetent.o \
-	getnetbyname.o \
-	getnetbyaddr.o \
-	getpeername.o \
-	getproto.o \
-	getprotoent.o \
-	getprotoname.o \
-	getservent.o \
-	getsockname.o \
-	getsockopt.o \
-	getsrvbyname.o \
-	getsrvbyport.o \
-	hton.o \
-	inet_addr.o \
-	inet_network.o \
-	inet_ntoa.o \
-	listen.o \
-	memcspn.o \
-	rcmd.o \
-	recv.o \
-	recvfrom.o \
-	res_comp.o \
-	res_init.o \
-	res_mkquery.o \
-	res_query.o \
-	res_send.o \
-	ruserok.o \
-	send.o \
-	sendto.o \
-	sethostent.o \
-	setsockopt.o \
-	servxcheck.o \
-	shutdown.o \
-	socket.o \
-	strcasecmp.o \
-
-include ../Makefile.inc
diff --git a/lib/ip/Makefile.in b/lib/ip/Makefile.in
new file mode 100644
index 000000000..6550f2bbf
--- /dev/null
+++ b/lib/ip/Makefile.in
@@ -0,0 +1,61 @@
+# Makefile for lib/ip.
+#
+# Note: The oneC_sum.c file is not used if there is an assembly equivalent.
+
+CFLAGS="-O -D_MINIX -D_POSIX_SOURCE -I. -DNDEBUG"
+
+LIBRARIES=libc
+
+libc_FILES=" \
+	accept.c \
+	bind.c \
+	connect.c \
+	dhcp_gettag.c \
+	dhcp_settag.c \
+	ether_line.c \
+	ethera2n.c \
+	ethere2a.c \
+	etherh2n.c \
+	ethern2h.c \
+	getdomain.c \
+	gethnmadr.c \
+	gethostent.c \
+	gethostname.c \
+	getnetbyaddr.c \
+	getnetbyname.c \
+	getnetent.c \
+	getpeername.c \
+	getproto.c \
+	getprotoent.c \
+	getprotoname.c \
+	getservent.c \
+	getsockname.c \
+	getsockopt.c \
+	getsrvbyname.c \
+	getsrvbyport.c \
+	hton.c \
+	inet_addr.c \
+	inet_network.c \
+	inet_ntoa.c \
+	listen.c \
+	memcspn.c \
+	oneC_sum.c \
+	rcmd.c \
+	recv.c \
+	recvfrom.c \
+	res_comp.c \
+	res_init.c \
+	res_mkquery.c \
+	res_query.c \
+	res_send.c \
+	ruserok.c \
+	send.c \
+	sendto.c \
+	servxcheck.c \
+	sethostent.c \
+	setsockopt.c \
+	shutdown.c \
+	socket.c \
+	strcasecmp.c"
+
+TYPE=both
diff --git a/lib/math/Makefile b/lib/math/Makefile
deleted file mode 100755
index 83b8cbb17..000000000
--- a/lib/math/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Makefile for lib/math.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE
-
-LIBRARIES = libc
-
-libc_OBJECTS	= \
-	asin.o \
-	atan.o \
-	atan2.o \
-	ceil.o \
-	exp.o \
-	fabs.o \
-	floor.o \
-	fmod.o \
-	hugeval.o \
-	log.o \
-	log10.o \
-	pow.o \
-	sin.o \
-	sinh.o \
-	sqrt.o \
-	tan.o \
-	tanh.o \
-
-include ../Makefile.inc
diff --git a/lib/math/Makefile.in b/lib/math/Makefile.in
new file mode 100644
index 000000000..5c09a9d6c
--- /dev/null
+++ b/lib/math/Makefile.in
@@ -0,0 +1,26 @@
+# Makefile for lib/math.
+
+CFLAGS="-O -D_MINIX -D_POSIX_SOURCE"
+
+LIBRARIES=libc
+
+libc_FILES=" \
+	asin.c \
+	atan.c \
+	atan2.c \
+	ceil.c \
+	exp.c \
+	fabs.c \
+	floor.c \
+	fmod.c \
+	hugeval.c \
+	log.c \
+	log10.c \
+	pow.c \
+	sin.c \
+	sinh.c \
+	sqrt.c \
+	tan.c \
+	tanh.c"
+
+TYPE=both
diff --git a/lib/math/frexp.s b/lib/math/frexp.s
deleted file mode 100755
index 502caf783..000000000
--- a/lib/math/frexp.s
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-.sect .text; .sect .rom; .sect .data; .sect .bss
-.extern _frexp
-.sect .text
-_frexp:
-#if __i386
-	push	ebp
-	mov	ebp, esp
-	push	12(ebp)
-	push	8(ebp)
-	mov	eax, esp
-	add	eax, -4
-	push	eax
-	call	.fef8
-	mov	eax, 16(ebp)
-	pop	(eax)
-	pop	eax
-	pop	edx
-	leave
-	ret
-#else /* i86 */
-	push	bp
-	mov	bp, sp
-	lea	bx, 4(bp)
-	mov	cx, #8
-	call	.loi
-	mov	ax, sp
-	add	ax, #-2
-	push	ax
-	call	.fef8
-	mov	bx, 12(bp)
-	pop	(bx)
-	call	.ret8
-	jmp	.cret
-#endif
diff --git a/lib/math/isnan.c b/lib/math/isnan.c
deleted file mode 100755
index 97257f45b..000000000
--- a/lib/math/isnan.c
+++ /dev/null
@@ -1,11 +0,0 @@
-int __IsNan(double d)
-{
-#if defined(vax) || defined(pdp)
-#else
-	float f = d;
-
-	if ((*((long *) &f) & 0x7f800000) == 0x7f800000 &&
-	    (*((long *) &f) & 0x007fffff) != 0) return 1;
-#endif
-	return 0;
-}
diff --git a/lib/math/ldexp.c b/lib/math/ldexp.c
deleted file mode 100755
index 501dac452..000000000
--- a/lib/math/ldexp.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
- * See the copyright notice in the ACK home directory, in the file "Copyright".
- */
-/* $Header$ */
-
-#include	<math.h>
-#include	<float.h>
-#include	<errno.h>
-
-double
-ldexp(double fl, int exp)
-{
-	int sign = 1;
-	int currexp;
-
-	if (__IsNan(fl)) {
-		errno = EDOM;
-		return fl;
-	}
-	if (fl == 0.0) return 0.0;
-	if (fl<0) {
-		fl = -fl;
-		sign = -1;
-	}
-	if (fl > DBL_MAX) {		/* for infinity */
-		errno = ERANGE;
-		return sign * fl;
-	}
-	fl = frexp(fl,&currexp);
-	exp += currexp;
-	if (exp > 0) {
-		if (exp > DBL_MAX_EXP) {
-			errno = ERANGE;
-			return sign * HUGE_VAL;
-		}
-		while (exp>30) {
-			fl *= (double) (1L << 30);
-			exp -= 30;
-		}
-		fl *= (double) (1L << exp);
-	}
-	else	{
-		/* number need not be normalized */
-		if (exp < DBL_MIN_EXP - DBL_MANT_DIG) {
-			return 0.0;
-		}
-		while (exp<-30) {
-			fl /= (double) (1L << 30);
-			exp += 30;
-		}
-		fl /= (double) (1L << -exp);
-	}
-	return sign * fl;
-}
diff --git a/lib/math/modf.s b/lib/math/modf.s
deleted file mode 100755
index 5d1e39c0b..000000000
--- a/lib/math/modf.s
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-.sect .text; .sect .rom; .sect .data; .sect .bss
-.extern _modf
-.sect .text
-_modf:
-#if __i386
-	push	ebp
-	mov	ebp, esp
-	push	12(ebp)
-	push	8(ebp)
-	push	1
-	push	4
-	call	.cif8
-	mov	eax, esp
-	push	eax
-	call	.fif8
-	pop	ecx
-	mov	edx, 16(ebp)
-	pop	ecx
-	pop	ebx
-	mov	0(edx), ecx
-	mov	4(edx), ebx
-	pop	eax
-	pop	edx
-	leave
-	ret
-#else /* i86 */
-	push	bp
-	mov	bp, sp
-	lea	bx, 4(bp)
-	mov	cx, #8
-	call	.loi
-	mov	dx, #1
-	push	dx
-	push	dx
-	push	dx
-	mov	ax, #2
-	push	ax
-	call	.cif8
-	mov	ax, sp
-	push	ax
-	call	.fif8
-	pop	bx
-	mov	bx, 12(bp)
-	mov	cx, #8
-	call	.sti
-	call	.ret8
-	jmp	.cret
-#endif
diff --git a/lib/other/Makefile b/lib/other/Makefile
deleted file mode 100755
index fc02d2f2f..000000000
--- a/lib/other/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-# Makefile for lib/other.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE -I../../servers
-
-LIBRARIES = libc
-
-libc_OBJECTS	= \
-	_allocmem.o \
-	_freemem.o \
-	_brk.o \
-	_reboot.o \
-	_seekdir.o \
-	_svrctl.o \
-	_getsysinfo.o \
-	_getprocnr.o \
-	_getnpid.o \
-	_getnprocnr.o \
-	_getpprocnr.o \
-	_devctl.o \
-	_findproc.o \
-	asynchio.o \
-	basename.o \
-	configfile.o \
-	crypt.o \
-	ctermid.o \
-	cuserid.o \
-	environ.o \
-	errno.o \
-	fdopen.o \
-	ffs.o \
-	flock.o \
-	fslib.o \
-	fsversion.o \
-	getgrent.o \
-	getlogin.o \
-	getopt.o \
-	getpagesize.o \
-	getpass.o \
-	getpwent.o \
-	getttyent.o \
-	getw.o \
-	hypot.o \
-	itoa.o \
-	loadname.o \
-	lock.o \
-	lrand.o \
-	lsearch.o \
-	memccpy.o \
-	mstats.o \
-	mtab.o \
-	nlist.o \
-	paramvalue.o \
-	peekpoke.o \
-	popen.o \
-	putenv.o \
-	putw.o \
-	random.o \
-	setgroups.o \
-	settimeofday.o \
-	stderr.o \
-	strdup.o \
-	strtok_r.o \
-	swab.o \
-	syscall.o \
-	sysconf.o \
-	syslog.o \
-	telldir.o \
-	termcap.o \
-	ttyname.o \
-	ttyslot.o \
-	v8regexp.o \
-	v8regsub.o 
-
-include ../Makefile.inc
diff --git a/lib/other/Makefile.in b/lib/other/Makefile.in
new file mode 100644
index 000000000..9f4319421
--- /dev/null
+++ b/lib/other/Makefile.in
@@ -0,0 +1,78 @@
+# Makefile for lib/other.
+
+CFLAGS="-O -D_MINIX -D_POSIX_SOURCE -I../../servers"
+
+LIBRARIES=libc
+
+libc_FILES=" \
+	_allocmem.c \
+	_brk.c \
+	_devctl.c \
+	_findproc.c \
+	_freemem.c \
+	_getnpid.c \
+	_getnprocnr.c \
+	_getpprocnr.c \
+	_getprocnr.c \
+	_getsysinfo.c \
+	_reboot.c \
+	_seekdir.c \
+	_svrctl.c \
+	asynchio.c \
+	basename.c \
+	bcmp.c \
+	bcopy.c \
+	bzero.c \
+	configfile.c \
+	crypt.c \
+	ctermid.c \
+	cuserid.c \
+	environ.c \
+	errno.c \
+	fdopen.c \
+	ffs.c \
+	flock.c \
+	fslib.c \
+	fsversion.c \
+	getgrent.c \
+	getlogin.c \
+	getpagesize.c \
+	getpass.c \
+	getpwent.c \
+	getttyent.c \
+	getw.c \
+	hypot.c \
+	index.c \
+	itoa.c \
+	loadname.c \
+	lock.c \
+	lrand.c \
+	lsearch.c \
+	memccpy.c \
+	mstats.c \
+	mtab.c \
+	nlist.c \
+	paramvalue.c \
+	peekpoke.c \
+	popen.c \
+	putenv.c \
+	putw.c \
+	random.c \
+	rindex.c \
+	setgroups.c \
+	settimeofday.c \
+	stderr.c \
+	strdup.c \
+	strtok_r.c \
+	swab.c \
+	syscall.c \
+	sysconf.c \
+	syslog.c \
+	telldir.c \
+	termcap.c \
+	ttyname.c \
+	ttyslot.c \
+	v8regexp.c \
+	v8regsub.c"
+
+TYPE=both
diff --git a/lib/other/getopt.c b/lib/other/getopt.c
deleted file mode 100755
index 23c397f3c..000000000
--- a/lib/other/getopt.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * getopt - parse command-line options
- */
-/* $Header$ */
-
-#include	<stdlib.h>
-#include	<string.h>
-#include	<stdio.h>
-
-#define ERR(s, c)       if(opterr){\
-	fputs(argv[0], stderr);\
-	fputs(s, stderr);\
-	fputc(c, stderr);\
-	fputc('\n', stderr);}
-
-int     opterr = 1;
-int     optind = 1;
-int	optopt;
-char    *optarg;
-
-int
-getopt(argc, argv, opts)
-int argc;
-char **argv;
-char *opts;
-{
-	static int sp = 1;
-	register c;
-	register char *cp;
-
-	if (sp == 1)
-		if (optind >= argc ||
-		   argv[optind][0] != '-' || argv[optind][1] == '\0')
-			return EOF;
-		else if (!strcmp(argv[optind], "--")) {
-			optind++;
-			return EOF;
-		}
-	optopt = c = argv[optind][sp];
-	if (c == ':' || (cp=strchr(opts, c)) == NULL) {
-		ERR (": illegal option -- ", c);
-		if (argv[optind][++sp] == '\0') {
-			optind++;
-			sp = 1;
-		}
-		return '?';
-	}
-	if (*++cp == ':') {
-		if (argv[optind][sp+1] != '\0')
-			optarg = &argv[optind++][sp+1];
-		else if (++optind >= argc) {
-			ERR (": option requires an argument -- ", c);
-			sp = 1;
-			return '?';
-		} else
-			optarg = argv[optind++];
-		sp = 1;
-	} else {
-		if (argv[optind][++sp] == '\0') {
-			sp = 1;
-			optind++;
-		}
-		optarg = NULL;
-	}
-	return c;
-}
diff --git a/lib/posix/Makefile b/lib/posix/Makefile
deleted file mode 100755
index 4ef614d9e..000000000
--- a/lib/posix/Makefile
+++ /dev/null
@@ -1,108 +0,0 @@
-# Makefile for lib/posix.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE
-
-LIBRARIES = libc
-
-libc_OBJECTS	= \
-	__exit.o \
-	_access.o \
-	_alarm.o \
-	_cfgetispeed.o \
-	_cfgetospeed.o \
-	_cfsetispeed.o \
-	_cfsetospeed.o \
-	_chdir.o \
-	_chmod.o \
-	_chown.o \
-	_chroot.o \
-	_close.o \
-	_closedir.o \
-	_creat.o \
-	_dup.o \
-	_dup2.o \
-	_execl.o \
-	_execle.o \
-	_execlp.o \
-	_execv.o \
-	_execve.o \
-	_execvp.o \
-	_fcntl.o \
-	_fork.o \
-	_fpathconf.o \
-	_fstat.o \
-	_fstatfs.o \
-	_fsync.o \
-	_getcwd.o \
-	_getegid.o \
-	_geteuid.o \
-	_getgid.o \
-	_getgroups.o \
-	_getpgrp.o \
-	_getpid.o \
-	_getppid.o \
-	_getuid.o \
-	_ioctl.o \
-	_isatty.o \
-	_kill.o \
-	_link.o \
-	_lseek.o \
-	_lstat.o \
-	_mkdir.o \
-	_mkfifo.o \
-	_mknod.o \
-	_mount.o \
-	_open.o \
-	_opendir.o \
-	_pathconf.o \
-	_pause.o \
-	_pipe.o \
-	_ptrace.o \
-	_read.o \
-	_readdir.o \
-	_rename.o \
-	_rewinddir.o \
-	_rmdir.o \
-	_readlink.o \
-	_select.o \
-	_setgid.o \
-	_setsid.o \
-	_setuid.o \
-	_sigaction.o \
-	_sigpending.o \
-	_sigprocmask.o \
-	_sigreturn.o \
-	_sigset.o \
-	_sigsetjmp.o \
-	_sigsuspend.o \
-	_sleep.o \
-	_stat.o \
-	_stime.o \
-	_symlink.o \
-	_sync.o \
-	_tcdrain.o \
-	_tcflow.o \
-	_tcflush.o \
-	_tcgetattr.o \
-	_tcsendbreak.o \
-	_tcsetattr.o \
-	_time.o \
-	_times.o \
-	_truncate.o \
-	_umask.o \
-	_umount.o \
-	_uname.o \
-	_unlink.o \
-	_utime.o \
-	_wait.o \
-	_waitpid.o \
-	_write.o \
-	getloadavg.o \
-	getopt.o \
-	gettimeofday.o \
-	priority.o \
-	usleep.o \
-
-include ../Makefile.inc
-
-$(call ADDDEPENDENCIES,_uname.o,/usr/include/minix/config.h)
diff --git a/lib/posix/Makefile.in b/lib/posix/Makefile.in
new file mode 100644
index 000000000..6e0587d1a
--- /dev/null
+++ b/lib/posix/Makefile.in
@@ -0,0 +1,109 @@
+# Makefile for lib/posix.
+
+CFLAGS="-O -D_MINIX -D_POSIX_SOURCE"
+
+LIBRARIES=libc
+
+libc_FILES=" \
+	__exit.c \
+	_access.c \
+	_alarm.c \
+	_cfgetispeed.c \
+	_cfgetospeed.c \
+	_cfsetispeed.c \
+	_cfsetospeed.c \
+	_chdir.c \
+	_chmod.c \
+	_chown.c \
+	_chroot.c \
+	_close.c \
+	_closedir.c \
+	_creat.c \
+	_dup.c \
+	_dup2.c \
+	_execl.c \
+	_execle.c \
+	_execlp.c \
+	_execv.c \
+	_execve.c \
+	_execvp.c \
+	_fcntl.c \
+	_fork.c \
+	_fpathconf.c \
+	_fstat.c \
+	_fstatfs.c \
+	_fsync.c \
+	_getcwd.c \
+	_getegid.c \
+	_geteuid.c \
+	_getgid.c \
+	_getgroups.c \
+	_getpgrp.c \
+	_getpid.c \
+	_getppid.c \
+	_getuid.c \
+	_ioctl.c \
+	_isatty.c \
+	_kill.c \
+	_link.c \
+	_lseek.c \
+	_lstat.c \
+	_mkdir.c \
+	_mkfifo.c \
+	_mknod.c \
+	_mount.c \
+	_open.c \
+	_opendir.c \
+	_pathconf.c \
+	_pause.c \
+	_pipe.c \
+	_ptrace.c \
+	_read.c \
+	_readdir.c \
+	_readlink.c \
+	_rename.c \
+	_rewinddir.c \
+	_rmdir.c \
+	_select.c \
+	_setgid.c \
+	_setsid.c \
+	_setuid.c \
+	_sigaction.c \
+	_sigpending.c \
+	_sigprocmask.c \
+	_sigreturn.c \
+	_sigset.c \
+	_sigsetjmp.c \
+	_sigsuspend.c \
+	_sleep.c \
+	_stat.c \
+	_stime.c \
+	_symlink.c \
+	_sync.c \
+	_tcdrain.c \
+	_tcflow.c \
+	_tcflush.c \
+	_tcgetattr.c \
+	_tcsendbreak.c \
+	_tcsetattr.c \
+	_time.c \
+	_times.c \
+	_truncate.c \
+	_umask.c \
+	_umount.c \
+	_uname.c \
+	_unlink.c \
+	_utime.c \
+	_wait.c \
+	_waitpid.c \
+	_write.c \
+	getloadavg.c \
+	getopt.c \
+	gettimeofday.c \
+	priority.c \
+	usleep.c"
+
+TYPE=both
+
+#$(call ADDDEPENDENCIES,_uname.o,/usr/include/minix/config.h)
+
diff --git a/lib/regex/Makefile b/lib/regex/Makefile
deleted file mode 100755
index 34cbaa5ed..000000000
--- a/lib/regex/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# Makefile for lib/regex.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE
-
-LIBRARIES = libc
-
-libc_OBJECTS	= \
-	regcomp.o \
-	regerror.o \
-	regexec.o \
-	regfree.o \
-
-include ../Makefile.inc
diff --git a/lib/regex/Makefile.in b/lib/regex/Makefile.in
new file mode 100644
index 000000000..41b55e292
--- /dev/null
+++ b/lib/regex/Makefile.in
@@ -0,0 +1,13 @@
+# Makefile for lib/regex.
+
+CFLAGS="-O -D_MINIX -D_POSIX_SOURCE"
+
+LIBRARIES=libc
+
+libc_FILES=" \
+	regcomp.c \
+	regerror.c \
+	regexec.c \
+	regfree.c"
+
+TYPE=both
diff --git a/lib/stdio/Makefile b/lib/stdio/Makefile
deleted file mode 100755
index f87cb1726..000000000
--- a/lib/stdio/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# Makefile for lib/stdio.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE
-
-LIBRARIES = libc
-
-libc_OBJECTS	= \
-	clearerr.o \
-	data.o \
-	doprnt.o \
-	doscan.o \
-	ecvt.o \
-	fclose.o \
-	feof.o \
-	ferror.o \
-	fflush.o \
-	fgetc.o \
-	fgetpos.o \
-	fgets.o \
-	fileno.o \
-	fillbuf.o \
-	flushbuf.o \
-	fopen.o \
-	fprintf.o \
-	fputc.o \
-	fputs.o \
-	fread.o \
-	freopen.o \
-	fscanf.o \
-	fseek.o \
-	fsetpos.o \
-	ftell.o \
-	fwrite.o \
-	getc.o \
-	getchar.o \
-	gets.o \
-	icompute.o \
-	mktemp.o \
-	perror.o \
-	printf.o \
-	putc.o \
-	putchar.o \
-	puts.o \
-	remove.o \
-	rewind.o \
-	scanf.o \
-	setbuf.o \
-	setvbuf.o \
-	sprintf.o \
-	sscanf.o \
-	tmpfile.o \
-	tmpnam.o \
-	ungetc.o \
-	vfprintf.o \
-	vprintf.o \
-	vscanf.o \
-	vsprintf.o \
-	vsscanf.o \
-
-include ../Makefile.inc
diff --git a/lib/stdio/Makefile.in b/lib/stdio/Makefile.in
new file mode 100644
index 000000000..1360e8168
--- /dev/null
+++ b/lib/stdio/Makefile.in
@@ -0,0 +1,60 @@
+# Makefile for lib/stdio.
+
+CFLAGS="-O -D_MINIX -D_POSIX_SOURCE"
+
+LIBRARIES=libc
+
+libc_FILES=" \
+	clearerr.c \
+	data.c \
+	doprnt.c \
+	doscan.c \
+	ecvt.c \
+	fclose.c \
+	feof.c \
+	ferror.c \
+	fflush.c \
+	fgetc.c \
+	fgetpos.c \
+	fgets.c \
+	fileno.c \
+	fillbuf.c \
+	flushbuf.c \
+	fopen.c \
+	fprintf.c \
+	fputc.c \
+	fputs.c \
+	fread.c \
+	freopen.c \
+	fscanf.c \
+	fseek.c \
+	fsetpos.c \
+	ftell.c \
+	fwrite.c \
+	getc.c \
+	getchar.c \
+	gets.c \
+	icompute.c \
+	mktemp.c \
+	perror.c \
+	printf.c \
+	putc.c \
+	putchar.c \
+	puts.c \
+	remove.c \
+	rewind.c \
+	scanf.c \
+	setbuf.c \
+	setvbuf.c \
+	sprintf.c \
+	sscanf.c \
+	tmpfile.c \
+	tmpnam.c \
+	ungetc.c \
+	vfprintf.c \
+	vprintf.c \
+	vscanf.c \
+	vsprintf.c \
+	vsscanf.c"
+
+TYPE=both
diff --git a/lib/syscall/Makefile b/lib/syscall/Makefile
deleted file mode 100755
index b730d2bbe..000000000
--- a/lib/syscall/Makefile
+++ /dev/null
@@ -1,114 +0,0 @@
-# Makefile for lib/syscall.
-
-LIBRARIES = libc
-
-libc_OBJECTS	= \
-	_exit.o \
-	access.o \
-	alarm.o \
-	allocmem.o \
-	freemem.o \
-	brk.o \
-	cfgetispeed.o \
-	cfgetospeed.o \
-	cfsetispeed.o \
-	cfsetospeed.o \
-	chdir.o \
-	chmod.o \
-	chown.o \
-	chroot.o \
-	close.o \
-	closedir.o \
-	creat.o \
-	devctl.o \
-	dup.o \
-	dup2.o \
-	execl.o \
-	execle.o \
-	execlp.o \
-	execv.o \
-	execve.o \
-	execvp.o \
-	fcntl.o \
-	fork.o \
-	fpathconf.o \
-	fstat.o \
-	fstatfs.o \
-	getcwd.o \
-	getegid.o \
-	geteuid.o \
-	getgid.o \
-	getgroups.o \
-	getnpid.o \
-	getnprocnr.o \
-	getpprocnr.o \
-	getpgrp.o \
-	getpid.o \
-	getppid.o \
-	getuid.o \
-	getprocnr.o \
-	getsysinfo.o \
-	findproc.o \
-	ioctl.o \
-	isatty.o \
-	kill.o \
-	link.o \
-	lseek.o \
-	lstat.o \
-	mkdir.o \
-	mkfifo.o \
-	mknod.o \
-	mount.o \
-	open.o \
-	opendir.o \
-	pathconf.o \
-	pause.o \
-	pipe.o \
-	ptrace.o \
-	read.o \
-	readdir.o \
-	readlink.o \
-	reboot.o \
-	rename.o \
-	rewinddir.o \
-	rmdir.o \
-	sbrk.o \
-	seekdir.o \
-	setgid.o \
-	setsid.o \
-	setuid.o \
-	sigaction.o \
-	sigaddset.o \
-	sigdelset.o \
-	sigemptyset.o \
-	sigfillset.o \
-	sigismember.o \
-	sigpending.o \
-	sigprocmask.o \
-	sigreturn.o \
-	sigsuspend.o \
-	sleep.o \
-	stat.o \
-	stime.o \
-	sync.o \
-	svrctl.o \
-	symlink.o \
-	tcdrain.o \
-	tcflow.o \
-	tcflush.o \
-	tcgetattr.o \
-	tcsendbreak.o \
-	tcsetattr.o \
-	time.o \
-	times.o \
-	truncate.o \
-	umask.o \
-	umount.o \
-	uname.o \
-	unlink.o \
-	utime.o \
-	wait.o \
-	waitpid.o \
-	write.o \
-
-include ../Makefile.inc
diff --git a/lib/syscall/Makefile.in b/lib/syscall/Makefile.in
new file mode 100644
index 000000000..ad9de23f2
--- /dev/null
+++ b/lib/syscall/Makefile.in
@@ -0,0 +1,114 @@
+# Makefile for lib/syscall.
+
+LIBRARIES=libc
+
+libc_FILES=" \
+	_exit.s \
+	access.s \
+	alarm.s \
+	allocmem.s \
+	brk.s \
+	cfgetispeed.s \
+	cfgetospeed.s \
+	cfsetispeed.s \
+	cfsetospeed.s \
+	chdir.s \
+	chmod.s \
+	chown.s \
+	chroot.s \
+	close.s \
+	closedir.s \
+	creat.s \
+	devctl.s \
+	dup.s \
+	dup2.s \
+	execl.s \
+	execle.s \
+	execlp.s \
+	execv.s \
+	execve.s \
+	execvp.s \
+	fcntl.s \
+	findproc.s \
+	fork.s \
+	fpathconf.s \
+	freemem.s \
+	fstat.s \
+	fstatfs.s \
+	getcwd.s \
+	getegid.s \
+	geteuid.s \
+	getgid.s \
+	getgroups.s \
+	getnpid.s \
+	getnprocnr.s \
+	getpgrp.s \
+	getpid.s \
+	getppid.s \
+	getpprocnr.s \
+	getprocnr.s \
+	getsysinfo.s \
+	getuid.s \
+	ioctl.s \
+	isatty.s \
+	kill.s \
+	link.s \
+	lseek.s \
+	lstat.s \
+	mkdir.s \
+	mkfifo.s \
+	mknod.s \
+	mount.s \
+	open.s \
+	opendir.s \
+	pathconf.s \
+	pause.s \
+	pipe.s \
+	ptrace.s \
+	read.s \
+	readdir.s \
+	readlink.s \
+	reboot.s \
+	rename.s \
+	rewinddir.s \
+	rmdir.s \
+	sbrk.s \
+	seekdir.s \
+	setgid.s \
+	setsid.s \
+	setuid.s \
+	sigaction.s \
+	sigaddset.s \
+	sigdelset.s \
+	sigemptyset.s \
+	sigfillset.s \
+	sigismember.s \
+	sigpending.s \
+	sigprocmask.s \
+	sigreturn.s \
+	sigsuspend.s \
+	sleep.s \
+	stat.s \
+	stime.s \
+	svrctl.s \
+	symlink.s \
+	sync.s \
+	tcdrain.s \
+	tcflow.s \
+	tcflush.s \
+	tcgetattr.s \
+	tcsendbreak.s \
+	tcsetattr.s \
+	time.s \
+	times.s \
+	truncate.s \
+	umask.s \
+	umount.s \
+	uname.s \
+	unlink.s \
+	utime.s \
+	wait.s \
+	waitpid.s \
+	write.s"
+
+TYPE=both
diff --git a/lib/syslib/Makefile b/lib/syslib/Makefile
deleted file mode 100755
index 749c8b9bd..000000000
--- a/lib/syslib/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# Makefile for lib/syslib.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE
-
-LIBRARIES = libsys
-
-libsys_OBJECTS	= \
-	sys_times.o \
-	sys_abort.o \
-	sys_exec.o \
-	sys_fork.o \
-	sys_int86.o \
-	sys_kill.o \
-	sys_newmap.o \
-	sys_sigsend.o \
-	sys_sigreturn.o \
-	sys_endsig.o \
-	sys_eniop.o \
-	sys_getsig.o \
-	sys_svrctl.o \
-	sys_trace.o \
-	sys_exit.o \
-	sys_sdevio.o \
-	sys_getinfo.o \
-	sys_irqctl.o \
-	sys_segctl.o \
-	sys_nice.o \
-	sys_umap.o \
-	sys_physcopy.o \
-	sys_vircopy.o \
-	sys_in.o \
-	sys_out.o \
-	sys_vinb.o \
-	sys_vinw.o \
-	sys_vinl.o \
-	sys_voutb.o \
-	sys_voutw.o \
-	sys_voutl.o \
-	sys_setalarm.o \
-	sys_memset.o \
-	taskcall.o \
-	sys_vm_setbuf.o \
-	sys_vm_map.o \
-	pci_attr_r8.o \
-	pci_attr_r16.o \
-	pci_attr_r32.o \
-	pci_attr_w8.o \
-	pci_attr_w16.o \
-	pci_attr_w32.o \
-	pci_dev_name.o \
-	pci_find_dev.o \
-	pci_first_dev.o \
-	pci_ids.o \
-	pci_init.o \
-	pci_init1.o \
-	pci_next_dev.o \
-	pci_rescan_bus.o \
-	pci_reserve.o \
-	pci_slot_name.o \
-
-include ../Makefile.inc
diff --git a/lib/syslib/Makefile.in b/lib/syslib/Makefile.in
new file mode 100644
index 000000000..e83977826
--- /dev/null
+++ b/lib/syslib/Makefile.in
@@ -0,0 +1,61 @@
+# Makefile for lib/syslib.
+
+CFLAGS="-O -D_MINIX -D_POSIX_SOURCE"
+
+LIBRARIES=libsys
+
+libsys_FILES=" \
+	pci_attr_r16.c \
+	pci_attr_r32.c \
+	pci_attr_r8.c \
+	pci_attr_w16.c \
+	pci_attr_w32.c \
+	pci_attr_w8.c \
+	pci_dev_name.c \
+	pci_find_dev.c \
+	pci_first_dev.c \
+	pci_ids.c \
+	pci_init.c \
+	pci_init1.c \
+	pci_next_dev.c \
+	pci_rescan_bus.c \
+	pci_reserve.c \
+	pci_slot_name.c \
+	sys_abort.c \
+	sys_eniop.c \
+	sys_endsig.c \
+	sys_exec.c \
+	sys_exit.c \
+	sys_fork.c \
+	sys_getinfo.c \
+	sys_getsig.c \
+	sys_in.c \
+	sys_int86.c \
+	sys_irqctl.c \
+	sys_kill.c \
+	sys_memset.c \
+	sys_newmap.c \
+	sys_nice.c \
+	sys_out.c \
+	sys_physcopy.c \
+	sys_sdevio.c \
+	sys_segctl.c \
+	sys_setalarm.c \
+	sys_sigreturn.c \
+	sys_sigsend.c \
+	sys_svrctl.c \
+	sys_times.c \
+	sys_trace.c \
+	sys_umap.c \
+	sys_vinb.c \
+	sys_vinl.c \
+	sys_vinw.c \
+	sys_vircopy.c \
+	sys_vm_map.c \
+	sys_vm_setbuf.c \
+	sys_voutb.c \
+	sys_voutl.c \
+	sys_voutw.c \
+	taskcall.c"
+
+TYPE=both
diff --git a/lib/sysutil/Makefile b/lib/sysutil/Makefile
deleted file mode 100644
index cdc86215c..000000000
--- a/lib/sysutil/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Makefile for lib/utils.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE
-
-LIBRARIES = libsysutil
-
-libsysutil_OBJECTS	= \
-	kmalloc.o \
-	kprintf.o \
-	kputc.o \
-	tickdelay.o \
-	getuptime.o \
-	env_get_prm.o \
-	env_parse.o \
-	env_panic.o \
-	env_prefix.o \
-	fkey_ctl.o \
-	panic.o \
-	report.o \
-	taskcall.o \
-
-include ../Makefile.inc
diff --git a/lib/sysutil/Makefile.in b/lib/sysutil/Makefile.in
new file mode 100644
index 000000000..6aa8ef125
--- /dev/null
+++ b/lib/sysutil/Makefile.in
@@ -0,0 +1,21 @@
+# Makefile for lib/utils.
+
+CFLAGS="-O -D_MINIX -D_POSIX_SOURCE"
+
+LIBRARIES=libsysutil
+
+libsysutil_FILES=" \
+	kmalloc.c \
+	kprintf.c \
+	kputc.c \
+	tickdelay.c \
+	getuptime.c \
+	env_get_prm.c \
+	env_parse.c \
+	env_panic.c \
+	env_prefix.c \
+	fkey_ctl.c \
+	panic.c \
+	report.c"
+
+TYPE=both
diff --git a/lib/timers/Makefile b/lib/timers/Makefile
deleted file mode 100644
index 175a4d8d6..000000000
--- a/lib/timers/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# Makefile for lib/tmrslib.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE
-
-LIBRARIES = libtimers
-
-libtimers_OBJECTS	= \
-	tmrs_set.o \
-	tmrs_clr.o \
-	tmrs_exp.o \
-
-include ../Makefile.inc
diff --git a/lib/timers/Makefile.in b/lib/timers/Makefile.in
new file mode 100644
index 000000000..a01d94228
--- /dev/null
+++ b/lib/timers/Makefile.in
@@ -0,0 +1,12 @@
+# Makefile for lib/tmrslib.
+
+CFLAGS="-O -D_MINIX -D_POSIX_SOURCE"
+
+LIBRARIES=libtimers
+
+libtimers_FILES=" \
+	tmrs_set.c \
+	tmrs_clr.c \
+	tmrs_exp.c"
+
+TYPE=both
diff --git a/lib/util/Makefile b/lib/util/Makefile
deleted file mode 100644
index 5e933569e..000000000
--- a/lib/util/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Makefile for lib/util.
-
-CFLAGS	= -O -D_MINIX -D_POSIX_SOURCE
-
-LIBRARIES = libutil
-
-libutil_OBJECTS	= \
-	openpty.o 
-
-include ../Makefile.inc
diff --git a/lib/util/Makefile.in b/lib/util/Makefile.in
new file mode 100644
index 000000000..3ef1cb817
--- /dev/null
+++ b/lib/util/Makefile.in
@@ -0,0 +1,9 @@
+# Makefile for lib/util.
+
+CFLAGS="-O -D_MINIX -D_POSIX_SOURCE"
+
+LIBRARIES=libutil
+
+libutil_FILES=openpty.c
+
+TYPE=both
diff --git a/lib/zlib-1.2.3/Makefile b/lib/zlib-1.2.3/Makefile
deleted file mode 100644
index 04ce64b20..000000000
--- a/lib/zlib-1.2.3/Makefile
+++ /dev/null
@@ -1,170 +0,0 @@
-# Makefile for zlib
-# Copyright (C) 1995-2003 Jean-loup Gailly.
-# For conditions of distribution and use, see copyright notice in zlib.h
-
-# To compile and test, type:
-#    ./configure; make test
-# The call of configure is optional if you don't have special requirements
-# If you wish to build zlib as a shared library, use: ./configure -s
-
-# To use the asm code, type:
-#    cp contrib/asm?86/match.S ./match.S
-#    make LOC=-DASMV OBJA=match.o
-
-# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
-#    make install
-# To install in $HOME instead of /usr/local, use:
-#    make install prefix=$HOME
-
-#CC=cc
-
-CFLAGS=-D_MINIX=1 -D_POSIX_SOURCE=1
-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-g -DDEBUG
-#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-#           -Wstrict-prototypes -Wmissing-prototypes
-
-#LDFLAGS=-L. libz.a
-#LDSHARED=cc
-#CPP=cc -E
-
-#LIBS=libz.a
-LIBRARIES=libz
-#SHAREDLIB=libz.so
-#SHAREDLIBV=libz.so.1.2.2
-#SHAREDLIBM=libz.so.1
-
-#AR=ar rc
-#RANLIB=ranlib
-#TAR=tar
-#SHELL=/bin/sh
-#EXE=
-
-#prefix =/usr/local
-#exec_prefix =${prefix}
-#libdir =${exec_prefix}/lib
-#includedir =${prefix}/include
-#mandir =/usr/local/man
-#man3dir = ${mandir}/man3
-
-#OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
-#       zutil.o inflate.o infback.o inftrees.o inffast.o
-
-#OBJA =
-# to use the asm code: make OBJA=match.o
-
-libz_OBJECTS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
-       zutil.o inflate.o infback.o inftrees.o inffast.o
-
-# to use the asm code: add match.o to liz_OBJECTS
-
-#TEST_OBJS = example.o minigzip.o
-
-#all:: example$(EXE) minigzip$(EXE)
-
-#check: test
-#test: all
-#	@LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
-#	echo hello world | ./minigzip | ./minigzip -d || \
-#	  echo '		*** minigzip test FAILED ***' ; \
-#	if ./example; then \
-#	  echo '		*** zlib test OK ***'; \
-#	else \
-#	  echo '		*** zlib test FAILED ***'; \
-#	fi
-
-#libz.a: $(OBJS) $(OBJA)
-#	$(AR) $@ $(OBJS) $(OBJA)
-#	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
-
-#match.o: match.S
-#	$(CPP) match.S > _match.s
-#	$(CC) -c _match.s
-#	mv _match.o match.o
-#	rm -f _match.s
-
-#$(SHAREDLIBV): $(OBJS)
-#	$(LDSHARED) -o $@ $(OBJS)
-#	rm -f $(SHAREDLIB) $(SHAREDLIBM)
-#	ln -s $@ $(SHAREDLIB)
-#	ln -s $@ $(SHAREDLIBM)
-
-#example$(EXE): example.o $(LIBS)
-#	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
-
-#minigzip$(EXE): minigzip.o $(LIBS)
-#	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
-
-#install: $(LIBS)
-#	-@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi
-#	-@if [ ! -d $(includedir)  ]; then mkdir -p $(includedir); fi
-#	-@if [ ! -d $(libdir)      ]; then mkdir -p $(libdir); fi
-#	-@if [ ! -d $(man3dir)     ]; then mkdir -p $(man3dir); fi
-#	install -o bin zlib.h zconf.h $(includedir)
-#	chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
-#	install -o bin $(LIBS) $(libdir)
-#	cd $(libdir); chmod 755 $(LIBS)
-#	-@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
-#	cd $(libdir); if test -f $(SHAREDLIBV); then \
-#	  rm -f $(SHAREDLIB) $(SHAREDLIBM); \
-#	  ln -s $(SHAREDLIBV) $(SHAREDLIB); \
-#	  ln -s $(SHAREDLIBV) $(SHAREDLIBM); \
-#	  (ldconfig || true)  >/dev/null 2>&1; \
-#	fi
-#	install -o bin zlib.3 $(man3dir)
-#	chmod 644 $(man3dir)/zlib.3
-# The ranlib in install is needed on NeXTSTEP which checks file times
-# ldconfig is for Linux
-
-#uninstall:
-#	cd $(includedir); \
-#	cd $(libdir); rm -f libz.a; \
-#	if test -f $(SHAREDLIBV); then \
-#	  rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
-#	fi
-#	cd $(man3dir); rm -f zlib.3
-
-mostlyclean: clean
-clean::
-	rm -f *.o *~ example$(EXE) minigzip$(EXE) \
-	   libz.* foo.gz so_locations \
-	   _match.s maketree contrib/infback9/*.o
-
-#maintainer-clean: distclean
-#distclean: clean
-#	cp -p Makefile.in Makefile
-#	cp -p zconf.in.h zconf.h
-#	rm -f .DS_Store
-
-#tags:
-#	etags *.[ch]
-#
-#depend:
-#	makedepend -- $(CFLAGS) -- *.[ch]
-
-## DO NOT DELETE THIS LINE -- make depend depends on it.
-
-#adler32.o: zlib.h zconf.h
-#compress.o: zlib.h zconf.h
-#crc32.o: crc32.h zlib.h zconf.h
-#deflate.o: deflate.h zutil.h zlib.h zconf.h
-#example.o: zlib.h zconf.h
-#gzio.o: zutil.h zlib.h zconf.h
-#inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-#inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-#infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-#inftrees.o: zutil.h zlib.h zconf.h inftrees.h
-#minigzip.o: zlib.h zconf.h
-#trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
-#uncompr.o: zlib.h zconf.h
-#zutil.o: zutil.h zlib.h zconf.h
-
-include ../Makefile.inc
-
-$(call ADDDEPENDENCIES,libz_OBJECTS,zlib.h zconf.h)
-$(call ADDDEPENDENCIES,deflate.o gzio.o inffast.o inflate.o infback.o inftrees.o trees.o zutil.o,zutil.h)
-$(call ADDDEPENDENCIES,deflate.o trees.o,deflate.h)
-$(call ADDDEPENDENCIES,inffast.o inflate.o infback.o inftrees.o,inftrees.h)
-$(call ADDDEPENDENCIES,inffast.o inflate.o infback.o,inflate.h inffast.h)
-$(call ADDDEPENDENCIES,crc32.o,crc32.h)
-
diff --git a/lib/zlib-1.2.3/Makefile.in b/lib/zlib-1.2.3/Makefile.in
index f16e9b269..07d3f60bd 100644
--- a/lib/zlib-1.2.3/Makefile.in
+++ b/lib/zlib-1.2.3/Makefile.in
@@ -1,154 +1,12 @@
 # Makefile for zlib
-# Copyright (C) 1995-2003 Jean-loup Gailly.
-# For conditions of distribution and use, see copyright notice in zlib.h
-
-# To compile and test, type:
-#    ./configure; make test
-# The call of configure is optional if you don't have special requirements
-# If you wish to build zlib as a shared library, use: ./configure -s
-
-# To use the asm code, type:
-#    cp contrib/asm?86/match.S ./match.S
-#    make LOC=-DASMV OBJA=match.o
-
-# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
-#    make install
-# To install in $HOME instead of /usr/local, use:
-#    make install prefix=$HOME
 
 CC=cc
 
 CFLAGS=-O
-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-g -DDEBUG
-#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-#           -Wstrict-prototypes -Wmissing-prototypes
 
-LDFLAGS=libz.a
-LDSHARED=$(CC)
-CPP=$(CC) -E
+LIBRARIES=libz
 
-LIBS=libz.a
-SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.3
-SHAREDLIBM=libz.so.1
+libz_FILES="adler32.c compress.c crc32.c gzio.c uncompr.c deflate.c trees.c \
+       zutil.c inflate.c infback.c inftrees.c inffast.c"
 
-AR=ar rc
-RANLIB=ranlib
-TAR=tar
-SHELL=/bin/sh
-EXE=
-
-prefix = /usr/local
-exec_prefix = ${prefix}
-libdir = ${exec_prefix}/lib
-includedir = ${prefix}/include
-mandir = ${prefix}/share/man
-man3dir = ${mandir}/man3
-
-OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
-       zutil.o inflate.o infback.o inftrees.o inffast.o
-
-OBJA =
-# to use the asm code: make OBJA=match.o
-
-TEST_OBJS = example.o minigzip.o
-
-all: example$(EXE) minigzip$(EXE)
-
-check: test
-test: all
-	@LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
-	echo hello world | ./minigzip | ./minigzip -d || \
-	  echo '		*** minigzip test FAILED ***' ; \
-	if ./example; then \
-	  echo '		*** zlib test OK ***'; \
-	else \
-	  echo '		*** zlib test FAILED ***'; \
-	fi
-
-libz.a: $(OBJS) $(OBJA)
-	$(AR) $@ $(OBJS) $(OBJA)
-	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
-
-match.o: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c _match.s
-	mv _match.o match.o
-	rm -f _match.s
-
-$(SHAREDLIBV): $(OBJS)
-	$(LDSHARED) -o $@ $(OBJS)
-	rm -f $(SHAREDLIB) $(SHAREDLIBM)
-	ln -s $@ $(SHAREDLIB)
-	ln -s $@ $(SHAREDLIBM)
-
-example$(EXE): example.o $(LIBS)
-	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
-
-minigzip$(EXE): minigzip.o $(LIBS)
-	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
-
-install: $(LIBS)
-	-@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi
-	-@if [ ! -d $(includedir)  ]; then mkdir -p $(includedir); fi
-	-@if [ ! -d $(libdir)      ]; then mkdir -p $(libdir); fi
-	-@if [ ! -d $(man3dir)     ]; then mkdir -p $(man3dir); fi
-	cp zlib.h zconf.h $(includedir)
-	chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
-	cp $(LIBS) $(libdir)
-	cd $(libdir); chmod 755 $(LIBS)
-	-@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
-	cd $(libdir); if test -f $(SHAREDLIBV); then \
-	  rm -f $(SHAREDLIB) $(SHAREDLIBM); \
-	  ln -s $(SHAREDLIBV) $(SHAREDLIB); \
-	  ln -s $(SHAREDLIBV) $(SHAREDLIBM); \
-	  (ldconfig || true)  >/dev/null 2>&1; \
-	fi
-	cp zlib.3 $(man3dir)
-	chmod 644 $(man3dir)/zlib.3
-# The ranlib in install is needed on NeXTSTEP which checks file times
-# ldconfig is for Linux
-
-uninstall:
-	cd $(includedir); \
-	cd $(libdir); rm -f libz.a; \
-	if test -f $(SHAREDLIBV); then \
-	  rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
-	fi
-	cd $(man3dir); rm -f zlib.3
-
-mostlyclean: clean
-clean:
-	rm -f *.o *~ example$(EXE) minigzip$(EXE) \
-	   libz.* foo.gz so_locations \
-	   _match.s maketree contrib/infback9/*.o
-
-maintainer-clean: distclean
-distclean: clean
-	cp -p Makefile.in Makefile
-	cp -p zconf.in.h zconf.h
-	rm -f .DS_Store
-
-tags:
-	etags *.[ch]
-
-depend:
-	makedepend -- $(CFLAGS) -- *.[ch]
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-adler32.o: zlib.h zconf.h
-compress.o: zlib.h zconf.h
-crc32.o: crc32.h zlib.h zconf.h
-deflate.o: deflate.h zutil.h zlib.h zconf.h
-example.o: zlib.h zconf.h
-gzio.o: zutil.h zlib.h zconf.h
-inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-inftrees.o: zutil.h zlib.h zconf.h inftrees.h
-minigzip.o: zlib.h zconf.h
-trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
-uncompr.o: zlib.h zconf.h
-zutil.o: zutil.h zlib.h zconf.h
+TYPE=both