diff --git a/arch/.unmaintained/amiga/workbench/hidds/graphics/intuition/.cvsignore b/arch/.unmaintained/amiga/workbench/hidds/graphics/intuition/.cvsignore
index 214653121d..f843bc3910 100644
--- a/arch/.unmaintained/amiga/workbench/hidds/graphics/intuition/.cvsignore
+++ b/arch/.unmaintained/amiga/workbench/hidds/graphics/intuition/.cvsignore
@@ -1,5 +1,4 @@
 *.bak
 mmakefile
 graphics_amiga_intui_end.c
-functable.c
 libdefs.h
diff --git a/arch/.unmaintained/amiga/workbench/hidds/graphics/intuition/mmakefile.src b/arch/.unmaintained/amiga/workbench/hidds/graphics/intuition/mmakefile.src
index bc4cd49ac6..d2d9f6cef2 100755
--- a/arch/.unmaintained/amiga/workbench/hidds/graphics/intuition/mmakefile.src
+++ b/arch/.unmaintained/amiga/workbench/hidds/graphics/intuition/mmakefile.src
@@ -120,30 +120,7 @@ $(END_FILE).c :
 	@$(ECHO) "Generating $@..."
 	@$(ECHO) "#include <libcore/libtail.c>" > $@
 
-# scripts/genfunctable.awk needs at least one function because a hidd
-# does not have functions the table is currently gerated with $(EDHO)
-functable.c : libdefs.h
-	@$(ECHO) "#ifndef LIBCORE_COMPILER_H"  > $@
-	@$(ECHO) "#   include <libcore/compiler.h>"  >> $@
-	@$(ECHO) "#endif"  >> $@
-	@$(ECHO) "#ifndef NULL"  >> $@
-	@$(ECHO) "#define NULL ((void *)0)"  >> $@
-	@$(ECHO) "#endif"  >> $@
-	@$(ECHO) ""  >> $@
-	@$(ECHO) '#include "libdefs.h"'  >> $@
-	@$(ECHO) "extern void AROS_SLIB_ENTRY(LC_BUILDNAME(OpenLib),LibHeader) (void);" >> $@
-	@$(ECHO) "extern void AROS_SLIB_ENTRY(LC_BUILDNAME(CloseLib),LibHeader) (void);"  >> $@
-	@$(ECHO) "extern void AROS_SLIB_ENTRY(LC_BUILDNAME(ExpungeLib),LibHeader) (void);"  >> $@
-	@$(ECHO) "extern void AROS_SLIB_ENTRY(LC_BUILDNAME(ExtFuncLib),LibHeader) (void);"  >> $@
-	@$(ECHO) ""  >> $@
-	@$(ECHO) "void *const LIBFUNCTABLE[]="  >> $@
-	@$(ECHO) "{"  >> $@
-	@$(ECHO) "    AROS_SLIB_ENTRY(LC_BUILDNAME(OpenLib),LibHeader),"  >> $@
-	@$(ECHO) "    AROS_SLIB_ENTRY(LC_BUILDNAME(CloseLib),LibHeader),"  >> $@
-	@$(ECHO) "    AROS_SLIB_ENTRY(LC_BUILDNAME(ExpungeLib),LibHeader),"  >> $@
-	@$(ECHO) "    AROS_SLIB_ENTRY(LC_BUILDNAME(ExtFuncLib),LibHeader),"  >> $@
-	@$(ECHO) "    (void *)-1L"  >> $@
-	@$(ECHO) "};"  >> $@
+%mkfunctable_arch
 
 #MM
 clean ::
diff --git a/arch/.unmaintained/hidd/mmakefile.src b/arch/.unmaintained/hidd/mmakefile.src
index d70de600d8..351d872dd6 100644
--- a/arch/.unmaintained/hidd/mmakefile.src
+++ b/arch/.unmaintained/hidd/mmakefile.src
@@ -43,6 +43,7 @@ clean ::
 	    $(OSGENDIR)/graphics/fakegfxhidd.o \
 	    *.err
 
+%mkfunctable_arch
 
 $(OSGENDIR)/graphics/%.o: %.c
 	%compile_q opt=$(GFX_CFLAGS)
diff --git a/arch/all-unix/hidd/parallel/.cvsignore b/arch/all-unix/hidd/parallel/.cvsignore
index 39b35b1d29..413e01912f 100644
--- a/arch/all-unix/hidd/parallel/.cvsignore
+++ b/arch/all-unix/hidd/parallel/.cvsignore
@@ -1,5 +1,4 @@
 libdefs.h
-functable.c
 parallel_end.c
 mmakefile
 *.err
diff --git a/arch/all-unix/hidd/parallel/mmakefile.src b/arch/all-unix/hidd/parallel/mmakefile.src
index 0f89509aa2..4fa443d79e 100644
--- a/arch/all-unix/hidd/parallel/mmakefile.src
+++ b/arch/all-unix/hidd/parallel/mmakefile.src
@@ -118,8 +118,7 @@ setup :
 	done
 
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c $(END_FILE) $(EXTRA_CLEAN) \
-	    $(LIB) $(SLIB)
+	$(RM) $(OBJDIR) *.err libdefs.h $(END_FILE) $(EXTRA_CLEAN) $(LIB) $(SLIB)
 
 $(OBJDIR)/%.o : %.c
 	@$(ECHO) "Compiling $(CURDIR)/$<..."
@@ -133,9 +132,7 @@ libdefs.h : lib.conf $(ARCHTOOL)
 
 FUNCTABLE_SRCS := $(foreach f,$(FUNCTIONS),$(f).c)
 
-functable.c : $(FUNCTABLE_SRCS) $(ARCHTOOL) libdefs.h
-	@$(ECHO) "Generating $@..."
-	@$(ARCHTOOL) -t
+%mkfunctable_arch
 
 $(END_FILE).c :
 	@$(ECHO) "Generating $@..."
diff --git a/arch/all-unix/hidd/serial/.cvsignore b/arch/all-unix/hidd/serial/.cvsignore
index 28bf5425da..1f5e30052a 100644
--- a/arch/all-unix/hidd/serial/.cvsignore
+++ b/arch/all-unix/hidd/serial/.cvsignore
@@ -1,6 +1,4 @@
 libdefs.h
-functable.c
-serial_end.c
 mmakefile
 serial_end.c
 *.err
diff --git a/arch/all-unix/hidd/serial/mmakefile.src b/arch/all-unix/hidd/serial/mmakefile.src
index eaaea56322..573c367135 100644
--- a/arch/all-unix/hidd/serial/mmakefile.src
+++ b/arch/all-unix/hidd/serial/mmakefile.src
@@ -118,7 +118,7 @@ setup :
 	done
 
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c $(END_FILE) $(EXTRA_CLEAN) \
+	$(RM) $(OBJDIR) *.err libdefs.h $(END_FILE) $(EXTRA_CLEAN) \
 	    $(LIB) $(SLIB)
 
 $(OBJDIR)/%.o : %.c
@@ -133,9 +133,7 @@ libdefs.h : lib.conf $(ARCHTOOL)
 
 FUNCTABLE_SRCS := $(foreach f,$(FUNCTIONS),$(f).c)
 
-functable.c : $(FUNCTABLE_SRCS) $(ARCHTOOL) libdefs.h
-	@$(ECHO) "Generating $@..."
-	@$(ARCHTOOL) -t
+%mkfunctable_arch
 
 $(END_FILE).c :
 	@$(ECHO) "Generating $@..."
diff --git a/arch/all-x11/hidd/mmakefile.src b/arch/all-x11/hidd/mmakefile.src
index c8183233ee..782ae9e305 100644
--- a/arch/all-x11/hidd/mmakefile.src
+++ b/arch/all-x11/hidd/mmakefile.src
@@ -21,10 +21,10 @@ endif
 
 X11KEYMAPTABLE_FILE := $(DEVSDIR)/Keymaps/X11/keycode2rawkey.table
 
-FILES	   := x11 support x11gfx onbitmap offbitmap functable endtag x11_init support x11kbd x11mouse
+FILES	   := x11 support x11gfx onbitmap offbitmap endtag x11_init support x11kbd x11mouse
 
 OBJDIR := $(GENDIR)/$(CURDIR)
-OBJS	:= $(foreach f,$(FILES) $(FUNCTIONS),$(OBJDIR)/$(f).o) $(OBJDIR)/xshm.o
+OBJS	:= $(foreach f,$(FILES),$(OBJDIR)/$(f).o) $(OBJDIR)/functable.o $(OBJDIR)/xshm.o
 LIB	:= $(LIBDIR)/libx11cl.a
 
 
@@ -104,15 +104,9 @@ libdefs.h : lib.conf
 	@$(ECHO) "Generating $@..."
 	@$(ARCHTOOL) -c
 	
-FUNCTABLE_SRCS := $(foreach f,$(FUNCTIONS),$(f).c)
-	
-functable.c : $(FUNCTABLE_SRCS) $(BINDIR)/scripts/genfunctable.awk \
-	libdefs.h
+%mkfunctable_arch
 
-#	@$(ECHO) "Generating $@..."
-#	$(ARCHTOOL) -t
-
-endtag.c :
+endtag.c : libdefs.h
 	@$(ECHO) "Generating $@..."
 	@$(ECHO) "#include <libcore/libtail.c>" > $@
 	
@@ -120,4 +114,4 @@ x11gfx_init.o : libdefs.h
 
 
 %common
-%include_deps $(foreach f,$(FILES) $(FUNCTIONS),$(OBJDIR)/$(f).d)
+%include_deps $(foreach f,$(FILES),$(OBJDIR)/$(f).d)
diff --git a/arch/i386-pc/Drivers/graphics/.cvsignore b/arch/i386-pc/Drivers/graphics/.cvsignore
index 8758a6b3d9..5da60c4622 100644
--- a/arch/i386-pc/Drivers/graphics/.cvsignore
+++ b/arch/i386-pc/Drivers/graphics/.cvsignore
@@ -1,4 +1,3 @@
 libdefs.h
 endtag.c
-functable.c
 mmakefile
diff --git a/arch/i386-pc/Drivers/graphics/mmakefile.src b/arch/i386-pc/Drivers/graphics/mmakefile.src
index ce15c4ba2c..dc8b43bca2 100644
--- a/arch/i386-pc/Drivers/graphics/mmakefile.src
+++ b/arch/i386-pc/Drivers/graphics/mmakefile.src
@@ -17,7 +17,7 @@ $(OSGENDIR)/boot/hidd_graphics.o : libdefs.h $(foreach f,$(FILES),$(OBJDIR)/$(f)
 
 #MM
 clean ::
-	-$(RM) $(OBJDIR) libdefs.h functable.c endtag.c *.err
+	-$(RM) $(OBJDIR) libdefs.h endtag.c *.err
 
 #MM
 setup :
@@ -38,10 +38,7 @@ libdefs.h : lib.conf
 	
 FUNCTABLE_SRCS := $(foreach f,$(FUNCTIONS),$(f).c)
 	
-functable.c : $(FUNCTABLE_SRCS) $(BINDIR)/scripts/genfunctable.awk \
-	libdefs.h
-	@$(ECHO) "Generating $@..."
-	$(ARCHTOOL) -t
+%mkfunctable_arch
 
 endtag.c :
 	@$(ECHO) "Generating $@..."
diff --git a/arch/i386-pc/Drivers/irq.hidd/.cvsignore b/arch/i386-pc/Drivers/irq.hidd/.cvsignore
index e7645a9e2b..35537839e6 100644
--- a/arch/i386-pc/Drivers/irq.hidd/.cvsignore
+++ b/arch/i386-pc/Drivers/irq.hidd/.cvsignore
@@ -1,6 +1,5 @@
 mmakefile
 libdefs.h
-functable.c
 endtag.c
 irq.s
 irq_init.s
diff --git a/arch/i386-pc/Drivers/irq.hidd/mmakefile.src b/arch/i386-pc/Drivers/irq.hidd/mmakefile.src
index 6f310525d3..abccce91e7 100644
--- a/arch/i386-pc/Drivers/irq.hidd/mmakefile.src
+++ b/arch/i386-pc/Drivers/irq.hidd/mmakefile.src
@@ -32,7 +32,7 @@ setup-includes :
 
 #MM
 clean ::
-	-$(RM) $(OBJDIR) libdefs.h functable.c endtag.c *.err
+	-$(RM) $(OBJDIR) libdefs.h endtag.c *.err
 
 #MM
 setup :
@@ -58,11 +58,8 @@ libdefs.h : lib.conf
 	@$(ARCHTOOL) -c
 	
 FUNCTABLE_SRCS := $(foreach f,$(FUNCTIONS),$(f).c)
-	
-functable.c : $(FUNCTABLE_SRCS) $(BINDIR)/scripts/genfunctable.awk \
-	libdefs.h
-	@$(ECHO) "Generating $@..."
-	$(ARCHTOOL) -t
+
+%mkfunctable_arch
 
 endtag.c :
 	@$(ECHO) "Generating $@..."
diff --git a/arch/i386-pc/Drivers/keyboard/.cvsignore b/arch/i386-pc/Drivers/keyboard/.cvsignore
index d8190ff3f3..45a5ac3e16 100644
--- a/arch/i386-pc/Drivers/keyboard/.cvsignore
+++ b/arch/i386-pc/Drivers/keyboard/.cvsignore
@@ -1,4 +1,3 @@
 mmakefile
 libdefs.h
-functable.c
 endtag.c
diff --git a/arch/i386-pc/Drivers/keyboard/mmakefile.src b/arch/i386-pc/Drivers/keyboard/mmakefile.src
index 2b2f564fb0..7a088a0711 100644
--- a/arch/i386-pc/Drivers/keyboard/mmakefile.src
+++ b/arch/i386-pc/Drivers/keyboard/mmakefile.src
@@ -15,7 +15,7 @@ Drivers-native-kbd : libdefs.h $(foreach f,$(FILES),$(OBJDIR)/$(f).o)
 
 #MM
 clean ::
-	-$(RM) $(OBJDIR) libdefs.h functable.c endtag.c *.err
+	-$(RM) $(OBJDIR) libdefs.h endtag.c *.err
 
 #MM
 setup :
@@ -35,11 +35,8 @@ libdefs.h : lib.conf
 	@$(ARCHTOOL) -c
 	
 FUNCTABLE_SRCS := $(foreach f,$(FUNCTIONS),$(f).c)
-	
-functable.c : $(FUNCTABLE_SRCS) $(BINDIR)/scripts/genfunctable.awk \
-	libdefs.h
-	@$(ECHO) "Generating $@..."
-	$(ARCHTOOL) -t
+
+%mkfunctable_arch
 
 endtag.c :
 	@$(ECHO) "Generating $@..."
diff --git a/arch/i386-pc/Drivers/pci.hidd/.cvsignore b/arch/i386-pc/Drivers/pci.hidd/.cvsignore
index d8190ff3f3..45a5ac3e16 100644
--- a/arch/i386-pc/Drivers/pci.hidd/.cvsignore
+++ b/arch/i386-pc/Drivers/pci.hidd/.cvsignore
@@ -1,4 +1,3 @@
 mmakefile
 libdefs.h
-functable.c
 endtag.c
diff --git a/arch/i386-pc/Drivers/pci.hidd/mmakefile.src b/arch/i386-pc/Drivers/pci.hidd/mmakefile.src
index 47c6ee4cf2..50e77e4d44 100644
--- a/arch/i386-pc/Drivers/pci.hidd/mmakefile.src
+++ b/arch/i386-pc/Drivers/pci.hidd/mmakefile.src
@@ -15,7 +15,7 @@ Drivers-native : libdefs.h $(foreach f,$(FILES),$(OBJDIR)/$(f).o)
 
 #MM
 clean ::
-	-$(RM) $(OBJDIR) libdefs.h functable.c endtag.c *.err
+	-$(RM) $(OBJDIR) libdefs.h endtag.c *.err
 
 #MM
 setup :
@@ -38,11 +38,8 @@ libdefs.h : lib.conf
 	@$(ARCHTOOL) -c
 	
 FUNCTABLE_SRCS := $(foreach f,$(FUNCTIONS),$(f).c)
-	
-functable.c : $(FUNCTABLE_SRCS) $(BINDIR)/scripts/genfunctable.awk \
-	libdefs.h
-	@$(ECHO) "Generating $@..."
-	$(ARCHTOOL) -t
+
+%mkfunctable_arch
 
 endtag.c :
 	@$(ECHO) "Generating $@..."
diff --git a/arch/i386-pc/Drivers/serial.hidd/.cvsignore b/arch/i386-pc/Drivers/serial.hidd/.cvsignore
index 3fae974189..f96a1cdade 100644
--- a/arch/i386-pc/Drivers/serial.hidd/.cvsignore
+++ b/arch/i386-pc/Drivers/serial.hidd/.cvsignore
@@ -1,4 +1,3 @@
 mmakefile
 endtag.c
 libdefs.h
-functable.c
diff --git a/arch/i386-pc/Drivers/serial.hidd/mmakefile.src b/arch/i386-pc/Drivers/serial.hidd/mmakefile.src
index 6c7bc7698a..055d27d6c2 100644
--- a/arch/i386-pc/Drivers/serial.hidd/mmakefile.src
+++ b/arch/i386-pc/Drivers/serial.hidd/mmakefile.src
@@ -17,7 +17,7 @@ Serial-native : libdefs.h $(foreach f,$(FILES),$(OBJDIR)/$(f).o)
 
 #MM
 clean ::
-	-$(RM) $(OBJDIR) libdefs.h functable.c endtag.c *.err
+	-$(RM) $(OBJDIR) libdefs.h endtag.c *.err
 
 #MM
 setup :
@@ -40,11 +40,8 @@ libdefs.h : lib.conf
 	@$(ARCHTOOL) -c
 	
 FUNCTABLE_SRCS := $(foreach f,$(FUNCTIONS),$(f).c)
-	
-functable.c : $(FUNCTABLE_SRCS) $(BINDIR)/scripts/genfunctable.awk \
-	libdefs.h
-	@$(ECHO) "Generating $@..."
-	$(ARCHTOOL) -t
+
+%mkfunctable_arch
 
 endtag.c :
 	@$(ECHO) "Generating $@..."
diff --git a/arch/i386-pc/Drivers/vga.hidd/.cvsignore b/arch/i386-pc/Drivers/vga.hidd/.cvsignore
index d8190ff3f3..45a5ac3e16 100644
--- a/arch/i386-pc/Drivers/vga.hidd/.cvsignore
+++ b/arch/i386-pc/Drivers/vga.hidd/.cvsignore
@@ -1,4 +1,3 @@
 mmakefile
 libdefs.h
-functable.c
 endtag.c
diff --git a/arch/i386-pc/Drivers/vga.hidd/mmakefile.src b/arch/i386-pc/Drivers/vga.hidd/mmakefile.src
index d636c39cad..bdc4e55133 100644
--- a/arch/i386-pc/Drivers/vga.hidd/mmakefile.src
+++ b/arch/i386-pc/Drivers/vga.hidd/mmakefile.src
@@ -16,7 +16,7 @@ Drivers-native : libdefs.h $(foreach f,$(FILES),$(OBJDIR)/$(f).o)
 
 #MM
 clean ::
-	-$(RM) $(OBJDIR) libdefs.h functable.c endtag.c *.err
+	-$(RM) $(OBJDIR) libdefs.h endtag.c *.err
 
 #MM
 setup :
@@ -39,11 +39,8 @@ libdefs.h : lib.conf
 	@$(ARCHTOOL) -c
 	
 FUNCTABLE_SRCS := $(foreach f,$(FUNCTIONS),$(f).c)
-	
-functable.c : $(FUNCTABLE_SRCS) $(BINDIR)/scripts/genfunctable.awk \
-	libdefs.h
-	@$(ECHO) "Generating $@..."
-	$(ARCHTOOL) -t
+
+%mkfunctable_arch
 
 endtag.c :
 	@$(ECHO) "Generating $@..."
diff --git a/config/make.tmpl b/config/make.tmpl
index 3af062c0f8..bad60ffa51 100644
--- a/config/make.tmpl
+++ b/config/make.tmpl
@@ -213,11 +213,44 @@ endif
 %end
 
 #------------------------------------------------------------------------------
-# Generate function table
-%define mkfunctable_q lib=dummy from=$^ to=$@
+# Compile function table
+%define compilefunctable
+$(OBJDIR)/functable.d : $(OBJDIR)/functable.c
+%mkdepend opt="$(MKDEPEND_FLAGS) -I."
+
+$(OBJDIR)/functable.o : $(OBJDIR)/functable.c
+%compile_q opt="$(CFLAGS) -I$(OBJDIR) -I."
+%end
+
+#------------------------------------------------------------------------------
+# Generate function table with archtool
+%define mkfunctable_arch archive=$(ARCHIVE)
+$(OBJDIR)/functable.c : mmakefile.src %(archive) libdefs.h
+	@$(ECHO) "Generating $@..."
+	@$(ARCHTOOL) -t %(archive)
+	$(MV) functable.c $@
+
+%compilefunctable
+%end
+
+#------------------------------------------------------------------------------
+# Generate function table with some awk script
+%define mkfunctable_q
+$(OBJDIR)/functable.c : mmakefile.src $(FUNCTABLE_SRCS) $(BINDIR)/scripts/genfunctable.awk libdefs.h
+	@$(ECHO) "Generating $@..."
+	@$(AWK) -f $(BINDIR)/scripts/genfunctable.awk $(FUNCTABLE_SRCS) > $@
+
+%compilefunctable
+%end
+
+#------------------------------------------------------------------------------
+# Generate function table -- seems to be unused
+%define mkfunctable_old lib=dummy from=$^ to=$@
 	@$(ECHO) "Regenerating %(to)..."
 	@$(AWK) -f $(TOP)/scripts/makefunctable.awk \
 	    -v lib="%(lib)" %(from)
+
+%compilefunctable
 %end
 
 #------------------------------------------------------------------------------
@@ -330,7 +363,7 @@ setup :
 	done
 
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c endtag.c $(EXTRA_CLEAN) \
+	$(RM) $(OBJDIR) *.err libdefs.h endtag.c $(EXTRA_CLEAN) \
 	    $(LIB) $(SLIB)
 
 $(OBJDIR)/%.o : %.c
@@ -343,10 +376,7 @@ libdefs.h : lib.conf $(BINDIR)/scripts/genlibdefs.awk
 
 FUNCTABLE_SRCS := $(foreach f,$(FUNCTIONS),$(f).c)
 
-functable.c : mmakefile.src $(FUNCTABLE_SRCS) $(BINDIR)/scripts/genfunctable.awk \
-	    libdefs.h
-	@$(ECHO) "Generating $@..."
-	@$(AWK) -f $(BINDIR)/scripts/genfunctable.awk $(FUNCTABLE_SRCS) > $@
+%mkfunctable_q
 
 endtag.c :
 	@$(ECHO) "Generating $@..."
@@ -422,7 +452,7 @@ setup :
 	done
 
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c endtag.c $(EXTRA_CLEAN) \
+	$(RM) $(OBJDIR) *.err libdefs.h endtag.c $(EXTRA_CLEAN) \
 	    $(LIB) $(SLIB)
 
 $(OBJDIR)/%.o : %.c
@@ -437,10 +467,7 @@ ifndef FUNCTABLE_SRCS
 FUNCTABLE_SRCS := $(foreach f,$(ALL_FUNCTIONS),$(f).c)
 endif
 
-functable.c : mmakefile.src $(FUNCTABLE_SRCS) $(BINDIR)/scripts/genfunctable.awk \
-	    libdefs.h
-	@$(ECHO) "Generating $@..."
-	@$(AWK) -f $(BINDIR)/scripts/genfunctable.awk $(FUNCTABLE_SRCS) > $@
+%mkfunctable_q
 
 $(END_FILE).c :
 	@$(ECHO) "Generating $@..."
@@ -513,8 +540,7 @@ setup :
 %mkdirs_q $(OBJDIR) $(LIBDIR) $(OSMODDIR) $(DESTDIRS)
 
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h $(OBJDIR)/functable.c endtag.c $(EXTRA_CLEAN) \
-	    $(LIB) $(OSMODDIR)/$(OSMODULE)
+	$(RM) $(OBJDIR) *.err libdefs.h endtag.c $(EXTRA_CLEAN) $(LIB) $(OSMODDIR)/$(OSMODULE)
 
 # Collect all functions in a linklib for fast linking
 $(LIB) : $(ALL_OBJS)
@@ -529,10 +555,7 @@ libdefs.h : lib.conf
 	@$(ARCHTOOL) -c
 
 ifndef NO_FUNCTABLE
-
-functable.c : mmakefile.src %(archive) libdefs.h
-	@$(ECHO) "Generating $@..."
-	@$(ARCHTOOL) -t %(archive)
+%mkfunctable_arch archive=%(archive)
 endif
 
 $(END_FILE).c :
@@ -610,7 +633,7 @@ setup :
 %mkdirs_q $(OBJDIR) $(LIBDIR) $(OSMODDIR) $(DESTDIRS)
 
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c endtag.c $(EXTRA_CLEAN) \
+	$(RM) $(OBJDIR) *.err libdefs.h endtag.c $(EXTRA_CLEAN) \
 	    $(LIB) $(OSMODDIR)/$(OSMODULE)
 
 # Collect all functions in a linklib for fast linking
@@ -630,10 +653,7 @@ ifndef FUNCTABLE_SRCS
 FUNCTABLE_SRCS := $(foreach f,$(ALL_FUNCTIONS),$(f).c)
 endif
 
-functable.c : mmakefile.src $(FUNCTABLE_SRCS) $(BINDIR)/scripts/genfunctable.awk \
-	    libdefs.h
-	@$(ECHO) "Generating $@..."
-	@$(AWK) -f $(BINDIR)/scripts/genfunctable.awk $(FUNCTABLE_SRCS) > $@
+%mkfunctable_q
 endif
 
 $(END_FILE).c :
@@ -874,9 +894,7 @@ ALL_FUNCTIONS := $(FUNCTIONS)
 $(OBJDIR)/%.o : %.c
 %compile_q
 
-functable.c : mmakefile.src $(ARCHIVE) libdefs.h
-	@$(ECHO) "Generating $@..."
-	@$(ARCHTOOL) -t $(ARCHIVE)
+%mkfunctable_arch
 
 $(END_FILE).c : $(TOP)/scripts/makeendtag.awk
 	@$(ECHO) "Regenerating $@..."
@@ -946,9 +964,7 @@ $(OBJDIR)/%.o : %.c
 
 FUNCTABLE_SRCS := $(foreach f,$(FUNCTIONS),$(f).c)
 
-functable.c : mmakefile.src $(FUNCTABLE_SRCS) $(BINDIR)/scripts/genfunctable.awk libdefs.h
-	@$(ECHO) "Generating $@..."
-	@$(AWK) -f $(BINDIR)/scripts/genfunctable.awk $(FUNCTABLE_SRCS) > $@
+%mkfunctable_q
 
 $(END_FILE).c : $(TOP)/scripts/makeendtag.awk
 	@$(ECHO) "Regenerating $@..."
@@ -1036,7 +1052,7 @@ setup :
 	done
 
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c $(END_FILE) $(EXTRA_CLEAN) \
+	$(RM) $(OBJDIR) *.err libdefs.h $(END_FILE) $(EXTRA_CLEAN) \
 	    $(LIB) $(SLIB)
 
 $(OBJDIR)/%.o : %.c
@@ -1049,9 +1065,7 @@ libdefs.h : lib.conf $(ARCHTOOL)
 
 FUNCTABLE_SRCS := $(foreach f,$(FUNCTIONS),$(f).c)
 
-functable.c : mmakefile.src $(FUNCTABLE_SRCS) $(ARCHTOOL) libdefs.h
-	@$(ECHO) "Generating $@..."
-	@$(ARCHTOOL) -t 
+%mkfunctable_arch archive=
 
 $(END_FILE).c :
 	@$(ECHO) "Generating $@..."
diff --git a/rom/aros/.cvsignore b/rom/aros/.cvsignore
index a3a4d068de..bc1b5cfa0b 100644
--- a/rom/aros/.cvsignore
+++ b/rom/aros/.cvsignore
@@ -1,6 +1,5 @@
 *.s
 makefile
 libdefs.h
-*functable.c
 *endtag.c
 mmakefile
diff --git a/rom/boopsi/.cvsignore b/rom/boopsi/.cvsignore
index 9dd06bec4e..a7c1976b2b 100644
--- a/rom/boopsi/.cvsignore
+++ b/rom/boopsi/.cvsignore
@@ -2,4 +2,3 @@
 mmakefile
 libdefs.h
 endtag.c
-functable.c
diff --git a/rom/cgfx/.cvsignore b/rom/cgfx/.cvsignore
index 8aa13181de..45a5ac3e16 100644
--- a/rom/cgfx/.cvsignore
+++ b/rom/cgfx/.cvsignore
@@ -1,4 +1,3 @@
 mmakefile
 libdefs.h
 endtag.c
-functable.c
diff --git a/rom/dos/.cvsignore b/rom/dos/.cvsignore
index b2459b1828..763b4cad47 100644
--- a/rom/dos/.cvsignore
+++ b/rom/dos/.cvsignore
@@ -1,4 +1,3 @@
-*functable.c
 *endtag.c
 libdefs.h
 makefile
diff --git a/rom/expansion/.cvsignore b/rom/expansion/.cvsignore
index b4b091c15e..7f0ec01afb 100644
--- a/rom/expansion/.cvsignore
+++ b/rom/expansion/.cvsignore
@@ -1,5 +1,3 @@
 mmakefile
 libdefs.h
-expansion_functable.c
 expansion_endtag.c
-functable.c
diff --git a/rom/graphics/.cvsignore b/rom/graphics/.cvsignore
index 6f13e6fe3b..871c7ba1a8 100644
--- a/rom/graphics/.cvsignore
+++ b/rom/graphics/.cvsignore
@@ -1,4 +1,3 @@
-*functable.c
 *endtag.c
 libdefs.h
 makefile
diff --git a/rom/hidd/.cvsignore b/rom/hidd/.cvsignore
index 7930bc85f7..5ab588a437 100644
--- a/rom/hidd/.cvsignore
+++ b/rom/hidd/.cvsignore
@@ -1,5 +1,4 @@
 *.bak
 mmakefile
-functable.c
 hiddclass_end.c
 libdefs.h
diff --git a/rom/intuition/.cvsignore b/rom/intuition/.cvsignore
index 6f13e6fe3b..871c7ba1a8 100644
--- a/rom/intuition/.cvsignore
+++ b/rom/intuition/.cvsignore
@@ -1,4 +1,3 @@
-*functable.c
 *endtag.c
 libdefs.h
 makefile
diff --git a/rom/keymap/.cvsignore b/rom/keymap/.cvsignore
index d70d24468c..f96a1cdade 100644
--- a/rom/keymap/.cvsignore
+++ b/rom/keymap/.cvsignore
@@ -1,4 +1,3 @@
 mmakefile
 endtag.c
-functable.c
 libdefs.h
diff --git a/rom/layers/.cvsignore b/rom/layers/.cvsignore
index a6dc743cba..31a951f819 100644
--- a/rom/layers/.cvsignore
+++ b/rom/layers/.cvsignore
@@ -2,6 +2,4 @@ makefile
 mmakefile
 *.s
 libdefs.h
-layers_functable.c
 endtag.c
-functable.c
diff --git a/rom/mathffp/.cvsignore b/rom/mathffp/.cvsignore
index 6f13e6fe3b..871c7ba1a8 100644
--- a/rom/mathffp/.cvsignore
+++ b/rom/mathffp/.cvsignore
@@ -1,4 +1,3 @@
-*functable.c
 *endtag.c
 libdefs.h
 makefile
diff --git a/rom/mathieeesingbas/.cvsignore b/rom/mathieeesingbas/.cvsignore
index 6f13e6fe3b..871c7ba1a8 100644
--- a/rom/mathieeesingbas/.cvsignore
+++ b/rom/mathieeesingbas/.cvsignore
@@ -1,4 +1,3 @@
-*functable.c
 *endtag.c
 libdefs.h
 makefile
diff --git a/rom/oop/.cvsignore b/rom/oop/.cvsignore
index 8aa13181de..45a5ac3e16 100644
--- a/rom/oop/.cvsignore
+++ b/rom/oop/.cvsignore
@@ -1,4 +1,3 @@
 mmakefile
 libdefs.h
 endtag.c
-functable.c
diff --git a/rom/timer/.cvsignore b/rom/timer/.cvsignore
index f68c146815..f7a58db093 100644
--- a/rom/timer/.cvsignore
+++ b/rom/timer/.cvsignore
@@ -2,4 +2,3 @@ endtag.c
 mmakefile
 libdefs.h
 *.s
-functable.c
diff --git a/rom/utility/.cvsignore b/rom/utility/.cvsignore
index 1d858023a6..09ce8be3ae 100644
--- a/rom/utility/.cvsignore
+++ b/rom/utility/.cvsignore
@@ -1,4 +1,3 @@
-functable.c
 endtag.c
 libdefs.h
 *.s
diff --git a/rom/workbench/.cvsignore b/rom/workbench/.cvsignore
index 6f13e6fe3b..871c7ba1a8 100644
--- a/rom/workbench/.cvsignore
+++ b/rom/workbench/.cvsignore
@@ -1,4 +1,3 @@
-*functable.c
 *endtag.c
 libdefs.h
 makefile
diff --git a/tools/archtools/archtool.c b/tools/archtools/archtool.c
index 25b1a16387..d07c3bc18e 100644
--- a/tools/archtools/archtool.c
+++ b/tools/archtools/archtool.c
@@ -921,17 +921,24 @@ int has_arch = 1;
 
   if(has_arch)
   {
-    if(argc != 2)
+    if(argc == 2)
+    {
+      fd = fopen(argv[1],"rb");
+      if(!fd)
+      {
+        fprintf( stderr, "Couldn't open file %s!\n", argv[1] );
+        exit(-1);
+      }
+    }
+    else if (argc == 1)
+    {
+      has_arch = 0;
+    }
+    else
     {
       fprintf( stderr, "Usage: %s <archfile>\n", argv[0] );
       exit(-1);
     }
-    fd = fopen(argv[1],"rb");
-    if(!fd)
-    {
-      fprintf( stderr, "Couldn't open file %s!\n", argv[1] );
-      exit(-1);
-    }
   }
   fdo = fopen("functable.c.new","w");
   if(!fdo)
diff --git a/tools/genskeleton/genskeleton.c b/tools/genskeleton/genskeleton.c
index cd9251d6a4..305d5abd56 100644
--- a/tools/genskeleton/genskeleton.c
+++ b/tools/genskeleton/genskeleton.c
@@ -235,8 +235,6 @@ static void make_cvsignore(void)
 
     fprintf(f, "*_end.c\n"
     	       "*_endtag.c\n"
-	       "*.map\n"
-	       "functable.c\n"
 	       "libdefs.h\n"
 	       "mmakefile\n");
     fclose(f);
@@ -335,8 +333,7 @@ static void make_mmakefilesrc(void)
 
     fprintf(f, "#MM\n"
     	       "clean ::\n"
-	       "\t$(RM) $(OBJDIR) *.err libdefs.h functable.c functions.* mmakefile \\\n"
-	       "\t$(END_FILE).c $(LIB) $(SLIB)\n\n");
+	       "\t$(RM) $(OBJDIR) *.err libdefs.h mmakefile $(END_FILE).c $(LIB) $(SLIB)\n\n");
 
     fprintf(f, "%%common\n");
 
diff --git a/workbench/classes/datatypes/ascii/.cvsignore b/workbench/classes/datatypes/ascii/.cvsignore
index 0da294f3c6..0b7087d30e 100644
--- a/workbench/classes/datatypes/ascii/.cvsignore
+++ b/workbench/classes/datatypes/ascii/.cvsignore
@@ -1,6 +1,5 @@
 *_end.c
 *_endtag.c
-functable.c
 libdefs.h
 mmakefile
 
diff --git a/workbench/classes/datatypes/ascii/mmakefile.src b/workbench/classes/datatypes/ascii/mmakefile.src
index b2ef1f9ba8..cb7cd89b1c 100644
--- a/workbench/classes/datatypes/ascii/mmakefile.src
+++ b/workbench/classes/datatypes/ascii/mmakefile.src
@@ -27,7 +27,6 @@ setup :
 
 #MM 
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c functions.* mmakefile \
-	$(END_FILE).c $(LIB) $(SLIB)
+	$(RM) $(OBJDIR) *.err libdefs.h mmakefile $(END_FILE).c $(LIB) $(SLIB)
 
 %common
diff --git a/workbench/classes/datatypes/binary/.cvsignore b/workbench/classes/datatypes/binary/.cvsignore
index 0da294f3c6..0b7087d30e 100644
--- a/workbench/classes/datatypes/binary/.cvsignore
+++ b/workbench/classes/datatypes/binary/.cvsignore
@@ -1,6 +1,5 @@
 *_end.c
 *_endtag.c
-functable.c
 libdefs.h
 mmakefile
 
diff --git a/workbench/classes/datatypes/binary/mmakefile.src b/workbench/classes/datatypes/binary/mmakefile.src
index 075d160392..bf0149c966 100644
--- a/workbench/classes/datatypes/binary/mmakefile.src
+++ b/workbench/classes/datatypes/binary/mmakefile.src
@@ -27,7 +27,6 @@ setup :
 
 #MM 
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c functions.* mmakefile \
-	$(END_FILE).c $(LIB) $(SLIB)
+	$(RM) $(OBJDIR) *.err libdefs.h mmakefile $(END_FILE).c $(LIB) $(SLIB)
 
 %common
diff --git a/workbench/classes/datatypes/picture/.cvsignore b/workbench/classes/datatypes/picture/.cvsignore
index 54129a5140..aced13f482 100644
--- a/workbench/classes/datatypes/picture/.cvsignore
+++ b/workbench/classes/datatypes/picture/.cvsignore
@@ -1,5 +1,4 @@
 *.map
-functable.c
 libdefs.h
 *_endtag.c
 mmakefile
diff --git a/workbench/classes/datatypes/picture/mmakefile.src b/workbench/classes/datatypes/picture/mmakefile.src
index 9b68573631..0b3b162aab 100644
--- a/workbench/classes/datatypes/picture/mmakefile.src
+++ b/workbench/classes/datatypes/picture/mmakefile.src
@@ -29,7 +29,6 @@ setup :
 
 #MM 
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c functions.* mmakefile \
-	$(END_FILE).c $(LIB) $(SLIB)
+	$(RM) $(OBJDIR) *.err libdefs.h mmakefile $(END_FILE).c $(LIB) $(SLIB)
 
 %common
diff --git a/workbench/classes/datatypes/text/.cvsignore b/workbench/classes/datatypes/text/.cvsignore
index 0da294f3c6..0b7087d30e 100644
--- a/workbench/classes/datatypes/text/.cvsignore
+++ b/workbench/classes/datatypes/text/.cvsignore
@@ -1,6 +1,5 @@
 *_end.c
 *_endtag.c
-functable.c
 libdefs.h
 mmakefile
 
diff --git a/workbench/classes/datatypes/text/mmakefile.src b/workbench/classes/datatypes/text/mmakefile.src
index 68de3ad60a..d052ac6777 100644
--- a/workbench/classes/datatypes/text/mmakefile.src
+++ b/workbench/classes/datatypes/text/mmakefile.src
@@ -28,7 +28,6 @@ setup :
 
 #MM 
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c functions.* mmakefile \
-	$(END_FILE).c $(LIB) $(SLIB)
+	$(RM) $(OBJDIR) *.err libdefs.h mmakefile $(END_FILE).c $(LIB) $(SLIB)
 
 %common
diff --git a/workbench/classes/gadgets/aroscheckbox/.cvsignore b/workbench/classes/gadgets/aroscheckbox/.cvsignore
index 71de0349e7..ddfddf181a 100644
--- a/workbench/classes/gadgets/aroscheckbox/.cvsignore
+++ b/workbench/classes/gadgets/aroscheckbox/.cvsignore
@@ -1,6 +1,4 @@
-aroscheckbox_functable.c
 aroscheckbox_endtag.c
 libdefs.h
 mmakefile
 *_end.c
-functable.c
diff --git a/workbench/classes/gadgets/aroscycle/.cvsignore b/workbench/classes/gadgets/aroscycle/.cvsignore
index fb0cad13b2..4a9e89d107 100644
--- a/workbench/classes/gadgets/aroscycle/.cvsignore
+++ b/workbench/classes/gadgets/aroscycle/.cvsignore
@@ -1,6 +1,4 @@
-aroscycle_functable.c
 aroscycle_endtag.c
 libdefs.h
 mmakefile
 *_end.c
-functable.c
diff --git a/workbench/classes/gadgets/aroslist/.cvsignore b/workbench/classes/gadgets/aroslist/.cvsignore
index 98d12bfaad..a3c191a368 100644
--- a/workbench/classes/gadgets/aroslist/.cvsignore
+++ b/workbench/classes/gadgets/aroslist/.cvsignore
@@ -1,6 +1,4 @@
-aroslist_functable.c
 aroslist_endtag.c
 libdefs.h
 mmakefile
 *_end.c
-functable.c
diff --git a/workbench/classes/gadgets/aroslistview/.cvsignore b/workbench/classes/gadgets/aroslistview/.cvsignore
index 5c49d26d39..f3221fdff0 100644
--- a/workbench/classes/gadgets/aroslistview/.cvsignore
+++ b/workbench/classes/gadgets/aroslistview/.cvsignore
@@ -1,6 +1,4 @@
-aroslistview_functable.c
 aroslistview_endtag.c
 libdefs.h
 mmakefile
 *_end.c
-functable.c
diff --git a/workbench/classes/gadgets/arosmutualexclude/.cvsignore b/workbench/classes/gadgets/arosmutualexclude/.cvsignore
index dfaffa1153..f50ddd42bf 100644
--- a/workbench/classes/gadgets/arosmutualexclude/.cvsignore
+++ b/workbench/classes/gadgets/arosmutualexclude/.cvsignore
@@ -1,6 +1,4 @@
-arosmutualexclude_functable.c
 arosmutualexclude_endtag.c
 libdefs.h
 mmakefile
 *_end.c
-functable.c
diff --git a/workbench/classes/gadgets/arospalette/.cvsignore b/workbench/classes/gadgets/arospalette/.cvsignore
index 31fc690b36..661d116e3a 100644
--- a/workbench/classes/gadgets/arospalette/.cvsignore
+++ b/workbench/classes/gadgets/arospalette/.cvsignore
@@ -1,6 +1,4 @@
-arospalette_functable.c
 arospalette_endtag.c
 libdefs.h
 mmakefile
 *_end.c
-functable.c
diff --git a/workbench/classes/gadgets/colorwheel/.cvsignore b/workbench/classes/gadgets/colorwheel/.cvsignore
index 0da294f3c6..0b7087d30e 100644
--- a/workbench/classes/gadgets/colorwheel/.cvsignore
+++ b/workbench/classes/gadgets/colorwheel/.cvsignore
@@ -1,6 +1,5 @@
 *_end.c
 *_endtag.c
-functable.c
 libdefs.h
 mmakefile
 
diff --git a/workbench/classes/gadgets/colorwheel/mmakefile.src b/workbench/classes/gadgets/colorwheel/mmakefile.src
index 778a058a5e..9718e6be85 100644
--- a/workbench/classes/gadgets/colorwheel/mmakefile.src
+++ b/workbench/classes/gadgets/colorwheel/mmakefile.src
@@ -28,7 +28,6 @@ setup :
 
 #MM 
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c functions.* mmakefile \
-	$(END_FILE).c $(LIB) $(SLIB)
+	$(RM) $(OBJDIR) *.err libdefs.h mmakefile $(END_FILE).c $(LIB) $(SLIB)
 
 %common
diff --git a/workbench/classes/gadgets/gradientslider/.cvsignore b/workbench/classes/gadgets/gradientslider/.cvsignore
index 0da294f3c6..5177a17749 100644
--- a/workbench/classes/gadgets/gradientslider/.cvsignore
+++ b/workbench/classes/gadgets/gradientslider/.cvsignore
@@ -1,6 +1,4 @@
 *_end.c
 *_endtag.c
-functable.c
 libdefs.h
 mmakefile
-
diff --git a/workbench/hidds/graphics/.cvsignore b/workbench/hidds/graphics/.cvsignore
index 6b3f40abeb..35ad91144a 100755
--- a/workbench/hidds/graphics/.cvsignore
+++ b/workbench/hidds/graphics/.cvsignore
@@ -1,6 +1,5 @@
 *.bak
 mmakefile
 graphics_end.c
-functable.c
 libdefs.h
 CHANGES
diff --git a/workbench/libs/amigaguide/.cvsignore b/workbench/libs/amigaguide/.cvsignore
index 6c575e6ac1..ee395da84e 100644
--- a/workbench/libs/amigaguide/.cvsignore
+++ b/workbench/libs/amigaguide/.cvsignore
@@ -1,5 +1,3 @@
 *_endtag.c
-functable.c
 libdefs.h
 mmakefile
-
diff --git a/workbench/libs/amigaguide/mmakefile.src b/workbench/libs/amigaguide/mmakefile.src
index 2800fe96b3..21ead19043 100644
--- a/workbench/libs/amigaguide/mmakefile.src
+++ b/workbench/libs/amigaguide/mmakefile.src
@@ -42,7 +42,6 @@ setup :
 
 #MM 
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c functions.* mmakefile \
-	$(END_FILE).c $(LIB) $(SLIB)
+	$(RM) $(OBJDIR) *.err libdefs.h mmakefile $(END_FILE).c $(LIB) $(SLIB)
 
 %common
diff --git a/workbench/libs/arp/.cvsignore b/workbench/libs/arp/.cvsignore
index 6f13e6fe3b..871c7ba1a8 100644
--- a/workbench/libs/arp/.cvsignore
+++ b/workbench/libs/arp/.cvsignore
@@ -1,4 +1,3 @@
-*functable.c
 *endtag.c
 libdefs.h
 makefile
diff --git a/workbench/libs/arp/mmakefile.src b/workbench/libs/arp/mmakefile.src
index 3125abd6e2..ccd9a183f9 100644
--- a/workbench/libs/arp/mmakefile.src
+++ b/workbench/libs/arp/mmakefile.src
@@ -65,8 +65,7 @@ setup :
 
 #MM
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c functions.* mmakefile \
-	$(END_FILE).c $(LIB) $(SLIB)
+	$(RM) $(OBJDIR) *.err libdefs.h mmakefile $(END_FILE).c $(LIB) $(SLIB)
 
 
 %additional_objs_rule
diff --git a/workbench/libs/asl/.cvsignore b/workbench/libs/asl/.cvsignore
index 788e7681aa..6336ec2f5a 100644
--- a/workbench/libs/asl/.cvsignore
+++ b/workbench/libs/asl/.cvsignore
@@ -1,7 +1,5 @@
 libdefs.h
 makefile
-asl_functable.c
 asl_endtag.c
 mmakefile
-functable.c
 *.err
diff --git a/workbench/libs/asl/mmakefile.src b/workbench/libs/asl/mmakefile.src
index 298fbb8ef4..3c1177462c 100644
--- a/workbench/libs/asl/mmakefile.src
+++ b/workbench/libs/asl/mmakefile.src
@@ -40,8 +40,7 @@ setup :
 
 #MM
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c functions.* mmakefile \
-	$(END_FILE).c $(LIB) $(SLIB)
+	$(RM) $(OBJDIR) *.err libdefs.h mmakefile $(END_FILE).c $(LIB) $(SLIB)
 
 $(OBJDIR)/%.d : %.c
 	%mkdepend_q
diff --git a/workbench/libs/commodities/.cvsignore b/workbench/libs/commodities/.cvsignore
index 76de861fb2..7694151b03 100644
--- a/workbench/libs/commodities/.cvsignore
+++ b/workbench/libs/commodities/.cvsignore
@@ -1,4 +1,3 @@
-functable.c
 commodities_endtag.c
 libdefs.h
 mmakefile
diff --git a/workbench/libs/commodities/mmakefile.src b/workbench/libs/commodities/mmakefile.src
index 4ae099f71d..5005d6d4cc 100644
--- a/workbench/libs/commodities/mmakefile.src
+++ b/workbench/libs/commodities/mmakefile.src
@@ -71,8 +71,7 @@ setup :
 
 #MM
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c functions.* mmakefile \
-	$(END_FILE).c $(LIB) $(SLIB)
+	$(RM) $(OBJDIR) *.err libdefs.h mmakefile $(END_FILE).c $(LIB) $(SLIB)
 
 $(OBJDIR)/%.d : %.c
 	%mkdepend_q
diff --git a/workbench/libs/datatypes/.cvsignore b/workbench/libs/datatypes/.cvsignore
index 6f13e6fe3b..871c7ba1a8 100644
--- a/workbench/libs/datatypes/.cvsignore
+++ b/workbench/libs/datatypes/.cvsignore
@@ -1,4 +1,3 @@
-*functable.c
 *endtag.c
 libdefs.h
 makefile
diff --git a/workbench/libs/datatypes/mmakefile.src b/workbench/libs/datatypes/mmakefile.src
index ac57c05989..289218be3c 100644
--- a/workbench/libs/datatypes/mmakefile.src
+++ b/workbench/libs/datatypes/mmakefile.src
@@ -89,8 +89,7 @@ setup :
 
 #MM
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c functions.* mmakefile \
-	$(END_FILE).c $(LIB) $(SLIB)
+	$(RM) $(OBJDIR) *.err libdefs.h mmakefile $(END_FILE).c $(LIB) $(SLIB)
 
 
 
diff --git a/workbench/libs/diskfont/.cvsignore b/workbench/libs/diskfont/.cvsignore
index 5dfe9600b8..1b19a822eb 100644
--- a/workbench/libs/diskfont/.cvsignore
+++ b/workbench/libs/diskfont/.cvsignore
@@ -1,6 +1,4 @@
-functable.c
 makefile
-diskfont_functable.c
 diskfont_endtag.c
 libdefs.h
 mmakefile
diff --git a/workbench/libs/diskfont/mmakefile.src b/workbench/libs/diskfont/mmakefile.src
index b0b53b62e8..bc3b0aa8ac 100644
--- a/workbench/libs/diskfont/mmakefile.src
+++ b/workbench/libs/diskfont/mmakefile.src
@@ -37,8 +37,7 @@ setup :
 
 #MM
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c functions.* mmakefile \
-	$(END_FILE).c $(LIB) $(SLIB)
+	$(RM) $(OBJDIR) *.err libdefs.h mmakefile $(END_FILE).c $(LIB) $(SLIB)
 
 %common
 %include_deps $(foreach f,$(INIT_FILE) $(END_FILE) $(FILES) $(FUNCTIONS),$(OBJDIR)/$(f).d)
diff --git a/workbench/libs/freetype/config/aros/sharedlib/mmakefile.src b/workbench/libs/freetype/config/aros/sharedlib/mmakefile.src
index 18867d8284..f294577cd7 100644
--- a/workbench/libs/freetype/config/aros/sharedlib/mmakefile.src
+++ b/workbench/libs/freetype/config/aros/sharedlib/mmakefile.src
@@ -33,8 +33,7 @@ contrib-freetype-library-clean : clean
 
 #MM
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c functions.* mmakefile \
-	$(END_FILE).c $(LIB) $(SLIB)
+	$(RM) $(OBJDIR) *.err libdefs.h mmakefile $(END_FILE).c $(LIB) $(SLIB)
 
 $(OBJDIR)/%.d : %.c
 	%mkdepend_q
diff --git a/workbench/libs/gadtools/.cvsignore b/workbench/libs/gadtools/.cvsignore
index 1321f886ad..f7164435a0 100644
--- a/workbench/libs/gadtools/.cvsignore
+++ b/workbench/libs/gadtools/.cvsignore
@@ -1,6 +1,4 @@
-functable.c
 libdefs.h
 makefile
-gadtools_functable.c
 gadtools_endtag.c
 mmakefile
diff --git a/workbench/libs/gadtools/mmakefile.src b/workbench/libs/gadtools/mmakefile.src
index 08410a28a7..3e7e08015f 100644
--- a/workbench/libs/gadtools/mmakefile.src
+++ b/workbench/libs/gadtools/mmakefile.src
@@ -8,7 +8,7 @@ ULIBNAME	:= GadTools
 CLASSFILES	:= buttonclass textclass sliderclass arrowclass scrollerclass \
 		   stringclass listviewclass checkboxclass cycleclass mxclass paletteclass
 		   
-FILES		:= functable basicfuncs gadgets menus $(CLASSFILES)
+FILES		:= basicfuncs gadgets menus $(CLASSFILES)
 FUNCTIONS	:= \
 	createcontext \
 	creategadgeta \
@@ -48,8 +48,7 @@ setup :
 
 #MM
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c functions.* mmakefile \
-	$(END_FILE).c $(LIB) $(SLIB)
+	$(RM) $(OBJDIR) *.err libdefs.h mmakefile $(END_FILE).c $(LIB) $(SLIB)
 
 $(OBJDIR)/%.d : %.c
 	%mkdepend_q
diff --git a/workbench/libs/icon/.cvsignore b/workbench/libs/icon/.cvsignore
index 1f131e50bd..e51f9a271f 100644
--- a/workbench/libs/icon/.cvsignore
+++ b/workbench/libs/icon/.cvsignore
@@ -1,5 +1,4 @@
 libdefs.h
 makefile
-*functable.c
 *endtag.c
 mmakefile
diff --git a/workbench/libs/icon/mmakefile.src b/workbench/libs/icon/mmakefile.src
index f8c708c025..306ff5fcbe 100644
--- a/workbench/libs/icon/mmakefile.src
+++ b/workbench/libs/icon/mmakefile.src
@@ -35,8 +35,7 @@ setup :
 
 #MM
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c functions.* mmakefile \
-	$(END_FILE).c $(LIB) $(SLIB)
+	$(RM) $(OBJDIR) *.err libdefs.h mmakefile $(END_FILE).c $(LIB) $(SLIB)
 
 %additional_objs_rule
 
diff --git a/workbench/libs/iffparse/.cvsignore b/workbench/libs/iffparse/.cvsignore
index c284b45a08..97b5e3c6f2 100644
--- a/workbench/libs/iffparse/.cvsignore
+++ b/workbench/libs/iffparse/.cvsignore
@@ -1,6 +1,4 @@
-functable.c
 makefile
-iffparse_functable.c
 iffparse_endtag.c
 libdefs.h
 mmakefile
diff --git a/workbench/libs/iffparse/mmakefile.src b/workbench/libs/iffparse/mmakefile.src
index c8d8364083..5929cc692e 100644
--- a/workbench/libs/iffparse/mmakefile.src
+++ b/workbench/libs/iffparse/mmakefile.src
@@ -87,8 +87,7 @@ setup :
 
 #MM
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c functions.* mmakefile \
-	$(END_FILE).c $(LIB) $(SLIB)
+	$(RM) $(OBJDIR) *.err libdefs.h mmakefile $(END_FILE).c $(LIB) $(SLIB)
 
 %common
 %include_deps $(foreach f,$(INIT_FILE) $(END_FILE) $(FILES) $(FUNCTIONS),$(OBJDIR)/$(f).d)
diff --git a/workbench/libs/locale/.cvsignore b/workbench/libs/locale/.cvsignore
index 6f13e6fe3b..871c7ba1a8 100644
--- a/workbench/libs/locale/.cvsignore
+++ b/workbench/libs/locale/.cvsignore
@@ -1,4 +1,3 @@
-*functable.c
 *endtag.c
 libdefs.h
 makefile
diff --git a/workbench/libs/locale/mmakefile.src b/workbench/libs/locale/mmakefile.src
index 6cb1baea6c..5f3b848d27 100644
--- a/workbench/libs/locale/mmakefile.src
+++ b/workbench/libs/locale/mmakefile.src
@@ -76,8 +76,7 @@ setup :
 
 #MM
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c functions.* mmakefile \
-	$(END_FILE).c $(LIB) $(SLIB)
+	$(RM) $(OBJDIR) *.err libdefs.h mmakefile $(END_FILE).c $(LIB) $(SLIB)
 
 $(OBJDIR)/%.d : %.c
 	%mkdepend_q
diff --git a/workbench/libs/lowlevel/.cvsignore b/workbench/libs/lowlevel/.cvsignore
index 6f13e6fe3b..871c7ba1a8 100644
--- a/workbench/libs/lowlevel/.cvsignore
+++ b/workbench/libs/lowlevel/.cvsignore
@@ -1,4 +1,3 @@
-*functable.c
 *endtag.c
 libdefs.h
 makefile
diff --git a/workbench/libs/lowlevel/mmakefile.src b/workbench/libs/lowlevel/mmakefile.src
index 3e39779908..258bb21c4a 100644
--- a/workbench/libs/lowlevel/mmakefile.src
+++ b/workbench/libs/lowlevel/mmakefile.src
@@ -26,8 +26,7 @@ setup :
 
 #MM
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c functions.* mmakefile \
-	$(END_FILE).c $(LIB) $(SLIB)
+	$(RM) $(OBJDIR) *.err libdefs.h mmakefile $(END_FILE).c $(LIB) $(SLIB)
 
 
 %additional_objs_rule
diff --git a/workbench/libs/mathieeedoubbas/.cvsignore b/workbench/libs/mathieeedoubbas/.cvsignore
index 84996250a1..ab3789b0e0 100644
--- a/workbench/libs/mathieeedoubbas/.cvsignore
+++ b/workbench/libs/mathieeedoubbas/.cvsignore
@@ -1,5 +1,4 @@
 libdefs.h
 mmakefile
-*functable.c
 *endtag.c
 *.err
diff --git a/workbench/libs/mathieeedoubbas/mmakefile.src b/workbench/libs/mathieeedoubbas/mmakefile.src
index a770b857be..c653ebd3f3 100644
--- a/workbench/libs/mathieeedoubbas/mmakefile.src
+++ b/workbench/libs/mathieeedoubbas/mmakefile.src
@@ -24,8 +24,7 @@ setup :
 
 #MM
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c functions.* mmakefile \
-	$(END_FILE).c $(LIB) $(SLIB)
+	$(RM) $(OBJDIR) *.err libdefs.h mmakefile $(END_FILE).c $(LIB) $(SLIB)
 
 
 %additional_objs_rule
diff --git a/workbench/libs/mathieeedoubtrans/.cvsignore b/workbench/libs/mathieeedoubtrans/.cvsignore
index 84996250a1..ab3789b0e0 100644
--- a/workbench/libs/mathieeedoubtrans/.cvsignore
+++ b/workbench/libs/mathieeedoubtrans/.cvsignore
@@ -1,5 +1,4 @@
 libdefs.h
 mmakefile
-*functable.c
 *endtag.c
 *.err
diff --git a/workbench/libs/mathieeedoubtrans/mmakefile.src b/workbench/libs/mathieeedoubtrans/mmakefile.src
index 4afdcb2631..8f08f30a9b 100644
--- a/workbench/libs/mathieeedoubtrans/mmakefile.src
+++ b/workbench/libs/mathieeedoubtrans/mmakefile.src
@@ -28,8 +28,7 @@ setup :
 
 #MM
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c functions.* mmakefile \
-	$(END_FILE).c $(LIB) $(SLIB)
+	$(RM) $(OBJDIR) *.err libdefs.h mmakefile $(END_FILE).c $(LIB) $(SLIB)
 
 
 %additional_objs_rule
diff --git a/workbench/libs/mathieeesingtrans/.cvsignore b/workbench/libs/mathieeesingtrans/.cvsignore
index 6f13e6fe3b..871c7ba1a8 100644
--- a/workbench/libs/mathieeesingtrans/.cvsignore
+++ b/workbench/libs/mathieeesingtrans/.cvsignore
@@ -1,4 +1,3 @@
-*functable.c
 *endtag.c
 libdefs.h
 makefile
diff --git a/workbench/libs/mathieeesingtrans/mmakefile.src b/workbench/libs/mathieeesingtrans/mmakefile.src
index 5a1ac508f7..94cfd3365b 100644
--- a/workbench/libs/mathieeesingtrans/mmakefile.src
+++ b/workbench/libs/mathieeesingtrans/mmakefile.src
@@ -26,8 +26,7 @@ setup :
 
 #MM
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c functions.* mmakefile \
-	$(END_FILE).c $(LIB) $(SLIB)
+	$(RM) $(OBJDIR) *.err libdefs.h mmakefile $(END_FILE).c $(LIB) $(SLIB)
 
 
 %additional_objs_rule
diff --git a/workbench/libs/mathtrans/.cvsignore b/workbench/libs/mathtrans/.cvsignore
index 6f13e6fe3b..871c7ba1a8 100644
--- a/workbench/libs/mathtrans/.cvsignore
+++ b/workbench/libs/mathtrans/.cvsignore
@@ -1,4 +1,3 @@
-*functable.c
 *endtag.c
 libdefs.h
 makefile
diff --git a/workbench/libs/mathtrans/mmakefile.src b/workbench/libs/mathtrans/mmakefile.src
index fa9e437cdb..9cbef40411 100644
--- a/workbench/libs/mathtrans/mmakefile.src
+++ b/workbench/libs/mathtrans/mmakefile.src
@@ -24,7 +24,7 @@ setup :
 
 #MM
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c functions.* mmakefile \
+	$(RM) $(OBJDIR) *.err libdefs.h mmakefile \
 	$(END_FILE).c $(LIB) $(SLIB)
 
 
diff --git a/workbench/libs/realtime/.cvsignore b/workbench/libs/realtime/.cvsignore
index 6f13e6fe3b..871c7ba1a8 100644
--- a/workbench/libs/realtime/.cvsignore
+++ b/workbench/libs/realtime/.cvsignore
@@ -1,4 +1,3 @@
-*functable.c
 *endtag.c
 libdefs.h
 makefile
diff --git a/workbench/libs/realtime/mmakefile.src b/workbench/libs/realtime/mmakefile.src
index de5b0e739c..7199e86d85 100644
--- a/workbench/libs/realtime/mmakefile.src
+++ b/workbench/libs/realtime/mmakefile.src
@@ -50,8 +50,7 @@ setup :
 
 #MM
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c functions.* mmakefile \
-	$(END_FILE).c $(LIB) $(SLIB)
+	$(RM) $(OBJDIR) *.err libdefs.h mmakefile $(END_FILE).c $(LIB) $(SLIB)
 
 %common
 %include_deps $(foreach f,$(INIT_FILE) $(END_FILE) $(FILES) $(FUNCTIONS),$(OBJDIR)/$(f).d)
diff --git a/workbench/libs/reqtools/.cvsignore b/workbench/libs/reqtools/.cvsignore
index 00a8e6d949..095170011f 100644
--- a/workbench/libs/reqtools/.cvsignore
+++ b/workbench/libs/reqtools/.cvsignore
@@ -1,3 +1,2 @@
 mmakefile
 libdefs.h
-functable.c
diff --git a/workbench/libs/reqtools/mmakefile.src b/workbench/libs/reqtools/mmakefile.src
index ce5db3b64f..6b08f1c0c1 100644
--- a/workbench/libs/reqtools/mmakefile.src
+++ b/workbench/libs/reqtools/mmakefile.src
@@ -53,8 +53,7 @@ setup :
 
 #MM
 clean ::
-	$(RM) $(OBJDIR) *.err libdefs.h functable.c functions.* mmakefile \
-	$(END_FILE).c $(LIB) $(SLIB)
+	$(RM) $(OBJDIR) *.err libdefs.h mmakefile $(END_FILE).c $(LIB) $(SLIB)
 
 %common
 %include_deps $(foreach f,$(INIT_FILE) $(END_FILE) $(FILES) $(FUNCTIONS),$(OBJDIR)/$(f).d)