chicken: added SONAME support for chicken 4

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

3 files changed, 1169 insertions, 20 deletions

diff --git a/recipes/chicken/chicken-4.2.0/soname.patch b/recipes/chicken/chicken-4.2.0/soname.patch
new file mode 100644
index 0000000000..3126c64d3e
--- /dev/null
+++ b/recipes/chicken/chicken-4.2.0/soname.patch
@@ -0,0 +1,1163 @@
+--- chicken-4.2.0/defaults.make	2009-09-21 21:17:38.000000000 -0300
++++ chicken-4.2.0/defaults.make	2009-10-16 11:18:28.000000000 -0300
+@@ -52,11 +52,12 @@
+ MANDIR = $(TOPMANDIR)/man1
+ INCDIR = $(PREFIX)/include
+ DOCDIR = $(DATADIR)/doc
+-CHICKENLIBDIR = $(LIBDIR)/chicken
++VARDIR ?= $(LIBDIR)
++CHICKENLIBDIR = $(VARDIR)/chicken
+ EGGDIR = $(CHICKENLIBDIR)/$(BINARYVERSION)
+ 
+ ifdef WINDOWS_SHELL
+-SPREFIX = $(subst /,\\,$(PREFIX))
++SPREFIX = $(subst /,$(SEP),$(PREFIX))
+ IBINDIR = $(SPREFIX)$(SEP)bin
+ ILIBDIR = $(SPREFIX)$(SEP)lib
+ ISHAREDIR = $(SPREFIX)$(SEP)share
+@@ -143,14 +144,15 @@
+ 
+ # options
+ 
+-ifndef NOPTABLES
+-C_COMPILER_PTABLES_OPTIONS ?= -DC_ENABLE_PTABLES
+-endif
+ INCLUDES ?= -I. -I$(SRCDIR)
+ C_COMPILER_COMPILE_OPTION ?= -c
+ C_COMPILER_OUTPUT_OPTION ?= -o
+ C_COMPILER_OUTPUT ?= $(C_COMPILER_OUTPUT_OPTION) $@
+ 
++ifndef NOPTABLES
++C_COMPILER_OPTIONS += -DC_ENABLE_PTABLES
++endif
++
+ ifdef DEBUGBUILD
+ ifeq ($(C_COMPILER),gcc)
+ C_COMPILER_OPTIMIZATION_OPTIONS ?= -g -Wall -Wno-unused
+@@ -219,7 +221,6 @@
+ # cross settings
+ 
+ HOST_C_COMPILER_OPTIONS ?= $(C_COMPILER_OPTIONS)
+-HOST_C_COMPILER_PTABLES_OPTIONS ?= $(C_COMPILER_PTABLES_OPTIONS)
+ HOST_C_COMPILER_COMPILE_OPTION ?= $(C_COMPILER_COMPILE_OPTION)
+ HOST_C_COMPILER_OPTIMIZATION_OPTIONS ?= $(C_COMPILER_OPTIMIZATION_OPTIONS)
+ HOST_C_COMPILER_SHARED_OPTIONS ?= $(C_COMPILER_SHARED_OPTIONS)
+@@ -279,17 +280,22 @@
+ 
+ # Scheme compiler flags
+ 
+-CHICKEN_OPTIONS = -no-trace -optimize-level 2 -include-path . -include-path $(SRCDIR)
++CHICKEN_OPTIONS = -optimize-level 2 -include-path . -include-path $(SRCDIR) -inline
+ ifdef DEBUGBUILD
+ CHICKEN_OPTIONS += -feature debugbuild -scrutinize -types $(SRCDIR)types.db
+ endif
+-CHICKEN_LIBRARY_OPTIONS = $(CHICKEN_OPTIONS) -explicit-use
+-CHICKEN_PROGRAM_OPTIONS = $(CHICKEN_OPTIONS) -no-lambda-info -inline -local
++CHICKEN_LIBRARY_OPTIONS = $(CHICKEN_OPTIONS) -explicit-use -no-trace
++CHICKEN_PROGRAM_OPTIONS = $(CHICKEN_OPTIONS) -no-lambda-info -local
+ CHICKEN_COMPILER_OPTIONS = $(CHICKEN_PROGRAM_OPTIONS) -extend private-namespace.scm
+ CHICKEN_UNSAFE_OPTIONS = -unsafe -no-lambda-info
+ CHICKEN_DYNAMIC_OPTIONS = $(CHICKEN_OPTIONS) -feature chicken-compile-shared -dynamic
+ CHICKEN_IMPORT_LIBRARY_OPTIONS = $(CHICKEN_DYNAMIC_OPTIONS)
+ 
++ifndef DEBUGBUILD
++CHICKEN_PROGRAM_OPTIONS += -no-trace
++CHICKEN_COMPILER_OPTIONS += -no-trace
++endif
++
+ # targets
+ 
+ CHICKEN_PROGRAM = $(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)
+--- chicken-4.2.0/Makefile.bsd	2009-09-21 21:17:38.000000000 -0300
++++ chicken-4.2.0/Makefile.bsd	2009-10-16 11:36:35.000000000 -0300
+@@ -37,13 +37,20 @@
+ ifdef DEBUGBUILD
+ C_COMPILER_OPTIMIZATION_OPTIONS ?= -g -Wall -Wno-unused
+ else
++ifdef OPTIMIZE_FOR_SPEED
++C_COMPILER_OPTIMIZATION_OPTIONS ?= -O3 -fomit-frame-pointer
++else
+ C_COMPILER_OPTIMIZATION_OPTIONS ?= -Os -fomit-frame-pointer
+ endif
++endif
+ LINKER_LINK_SHARED_LIBRARY_OPTIONS = -shared
+ LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -shared -Wl,-R$(RUNTIME_LINKER_PATH) -Wl,-L.
+ LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,-R$(RUNTIME_LINKER_PATH)
++LIBCHICKEN_SO_LINKER_OPTIONS = -Wl,-soname,libchicken.so$(SONAME_VERSION)
++LIBUCHICKEN_SO_LINKER_OPTIONS = -Wl,-soname,libuchicken.so$(SONAME_VERSION)
+ LIBRARIES = -lm
+ NEEDS_RELINKING = yes
++USES_SONAME = yes
+ 
+ # special files
+ 
+--- chicken-4.2.0/Makefile.cross-linux-mingw	2009-09-21 21:17:38.000000000 -0300
++++ chicken-4.2.0/Makefile.cross-linux-mingw	2009-10-16 11:36:35.000000000 -0300
+@@ -49,7 +49,11 @@
+ ifdef DEBUGBUILD
+ C_COMPILER_OPTIMIZATION_OPTIONS ?= -g -Wall -Wno-unused
+ else
+-C_COMPILER_OPTIMIZATION_OPTIONS ?= -Os
++ifdef OPTIMIZE_FOR_SPEED
++C_COMPILER_OPTIMIZATION_OPTIONS ?= -O3 -fomit-frame-pointer
++else
++C_COMPILER_OPTIMIZATION_OPTIONS ?= -Os -fomit-frame-pointer
++endif
+ endif
+ C_COMPILER_SHARED_OPTIONS = -DPIC
+ C_COMPILER_GUI_RUNTIME_OPTIONS = -DC_WINDOWS_GUI
+--- chicken-4.2.0/Makefile.cygwin	2009-09-21 21:17:38.000000000 -0300
++++ chicken-4.2.0/Makefile.cygwin	2009-10-16 11:36:35.000000000 -0300
+@@ -47,7 +47,11 @@
+ ifdef DEBUGBUILD
+ C_COMPILER_OPTIMIZATION_OPTIONS ?= -g -Wall -Wno-unused
+ else
+-C_COMPILER_OPTIMIZATION_OPTIONS ?= -Os
++ifdef OPTIMIZE_FOR_SPEED
++C_COMPILER_OPTIMIZATION_OPTIONS ?= -O3 -fomit-frame-pointer
++else
++C_COMPILER_OPTIMIZATION_OPTIONS ?= -Os -fomit-frame-pointer
++endif
+ endif
+ C_COMPILER_SHARED_OPTIONS = -DPIC
+ LINKER_LINK_SHARED_LIBRARY_OPTIONS = -shared 
+--- chicken-4.2.0/Makefile.linux	2009-09-21 21:17:38.000000000 -0300
++++ chicken-4.2.0/Makefile.linux	2009-10-16 11:36:35.000000000 -0300
+@@ -37,13 +37,20 @@
+ ifdef DEBUGBUILD
+ C_COMPILER_OPTIMIZATION_OPTIONS ?= -g -Wall -Wno-unused
+ else
++ifdef OPTIMIZE_FOR_SPEED
++C_COMPILER_OPTIMIZATION_OPTIONS ?= -O3 -fomit-frame-pointer
++else
+ C_COMPILER_OPTIMIZATION_OPTIONS ?= -Os -fomit-frame-pointer
+ endif
++endif
+ LINKER_LINK_SHARED_LIBRARY_OPTIONS = -shared
+ LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -L. -shared -Wl,-R$(RUNTIME_LINKER_PATH)
+ LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,-R$(RUNTIME_LINKER_PATH)
++LIBCHICKEN_SO_LINKER_OPTIONS = -Wl,-soname,libchicken.so$(SONAME_VERSION)
++LIBUCHICKEN_SO_LINKER_OPTIONS = -Wl,-soname,libuchicken.so$(SONAME_VERSION)
+ LIBRARIES = -lm -ldl
+ NEEDS_RELINKING = yes
++USES_SONAME = yes
+ 
+ # special files
+ 
+--- chicken-4.2.0/Makefile.macosx	2009-09-21 21:17:38.000000000 -0300
++++ chicken-4.2.0/Makefile.macosx	2009-10-16 11:36:35.000000000 -0300
+@@ -41,8 +41,12 @@
+ ifdef DEBUGBUILD
+ C_COMPILER_OPTIMIZATION_OPTIONS ?= -g -Wall -Wno-unused
+ else
++ifdef OPTIMIZE_FOR_SPEED
++C_COMPILER_OPTIMIZATION_OPTIONS ?= -O3 -fomit-frame-pointer
++else
+ C_COMPILER_OPTIMIZATION_OPTIONS ?= -Os -fomit-frame-pointer
+ endif
++endif
+ LINKER_LINK_SHARED_LIBRARY_OPTIONS = -dynamiclib -compatibility_version 1 -current_version 1.0 -install_name $@
+ POSTINSTALL_PROGRAM_FLAGS = -change libchicken$(SO) $(LIBDIR)/libchicken$(SO)
+ LIBRARIAN_OPTIONS = scru
+@@ -73,9 +77,9 @@
+ ifneq ($(HACKED_APPLY),)
+ # We undefine HACKED_APPLY in order to override rules.make.
+ HACKED_APPLY=
+-apply-hack.ppc.darwin$(O): apply-hack.ppc.darwin.s
++apply-hack.ppc.darwin$(O): apply-hack.ppc.darwin.S
+ 	as -arch ppc -o $@ $<
+-apply-hack.x86$(O): apply-hack.x86.s
++apply-hack.x86$(O): apply-hack.x86.S
+ 	as -arch i386 -o $@ $<
+ $(APPLY_HACK_OBJECT): apply-hack.x86$(O) apply-hack.ppc.darwin$(O)
+ 	lipo -create -output $(APPLY_HACK_OBJECT) $^
+--- chicken-4.2.0/Makefile.mingw-msys	2009-09-21 21:17:38.000000000 -0300
++++ chicken-4.2.0/Makefile.mingw-msys	2009-10-16 11:36:35.000000000 -0300
+@@ -45,8 +45,12 @@
+ ifdef DEBUGBUILD
+ C_COMPILER_OPTIMIZATION_OPTIONS ?= -g -Wall -Wno-unused
+ else
++ifdef OPTIMIZE_FOR_SPEED
++C_COMPILER_OPTIMIZATION_OPTIONS ?= -O3
++else
+ C_COMPILER_OPTIMIZATION_OPTIONS ?= -Os
+ endif
++endif
+ C_COMPILER_SHARED_OPTIONS = -DPIC
+ C_COMPILER_GUI_RUNTIME_OPTIONS = -DC_WINDOWS_GUI
+ LINKER_OPTIONS = -Wl,--enable-auto-import
+--- chicken-4.2.0/Makefile.mingw	2009-09-21 21:17:38.000000000 -0300
++++ chicken-4.2.0/Makefile.mingw	2009-10-16 11:36:35.000000000 -0300
+@@ -25,7 +25,7 @@
+ # POSSIBILITY OF SUCH DAMAGE.
+ 
+ 
+-SEP = \\
++SEP = $(strip \)
+ SRCDIR =.$(SEP)
+ 
+ # platform configuration
+@@ -54,8 +54,12 @@
+ ifdef DEBUGBUILD
+ C_COMPILER_OPTIMIZATION_OPTIONS ?= -g -Wall -Wno-unused
+ else
++ifdef OPTIMIZE_FOR_SPEED
++C_COMPILER_OPTIMIZATION_OPTIONS ?= -O3
++else
+ C_COMPILER_OPTIMIZATION_OPTIONS ?= -Os
+ endif
++endif
+ C_COMPILER_SHARED_OPTIONS = -DPIC
+ C_COMPILER_GUI_RUNTIME_OPTIONS = -DC_WINDOWS_GUI
+ LINKER_LINK_SHARED_LIBRARY_OPTIONS = -shared
+--- chicken-4.2.0/Makefile.solaris	2009-09-21 21:17:38.000000000 -0300
++++ chicken-4.2.0/Makefile.solaris	2009-10-16 11:36:35.000000000 -0300
+@@ -37,8 +37,12 @@
+ ifdef DEBUGBUILD
+ C_COMPILER_OPTIMIZATION_OPTIONS ?= -g -Wall -Wno-unused
+ else
++ifdef OPTIMIZE_FOR_SPEED
++C_COMPILER_OPTIMIZATION_OPTIONS ?= -O3 -fomit-frame-pointer
++else
+ C_COMPILER_OPTIMIZATION_OPTIONS ?= -Os -fomit-frame-pointer
+ endif
++endif
+ LINKER_LINK_SHARED_LIBRARY_OPTIONS = -shared
+ LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -shared -Wl,-R$(RUNTIME_LINKER_PATH) -Wl,-L.
+ LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,-R$(RUNTIME_LINKER_PATH)
+--- chicken-4.2.0/rules.make	2009-09-21 21:17:38.000000000 -0300
++++ chicken-4.2.0/rules.make	2009-10-16 11:18:01.000000000 -0300
+@@ -59,403 +59,403 @@
+ # library objects
+ 
+ runtime$(O): runtime.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ gui-runtime$(O): runtime.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $(C_COMPILER_GUI_RUNTIME_OPTIONS) $< \
+ 	  $(C_COMPILER_OUTPUT)
+ eval$(O): eval.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ expand$(O): expand.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ chicken-syntax$(O): chicken-syntax.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ data-structures$(O): data-structures.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ ports$(O): ports.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ files$(O): files.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ extras$(O): extras.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ library$(O): library.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ lolevel$(O): lolevel.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ posixunix$(O): posixunix.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ posixwin$(O): posixwin.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ profiler$(O): profiler.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ regex$(O): regex.c chicken.h $(CHICKEN_CONFIG_H) 
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ scheduler$(O): scheduler.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ srfi-1$(O): srfi-1.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ srfi-13$(O): srfi-13.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ srfi-14$(O): srfi-14.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ srfi-18$(O): srfi-18.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ srfi-69$(O): srfi-69.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ srfi-4$(O): srfi-4.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ stub$(O): stub.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ tcp$(O): tcp.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ utils$(O): utils.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ 
+ uruntime$(O): runtime.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ ueval$(O): ueval.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ udata-structures$(O): udata-structures.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ uports$(O): uports.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ ufiles$(O): ufiles.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ uextras$(O): uextras.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ ulibrary$(O): ulibrary.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ ulolevel$(O): ulolevel.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ uposixunix$(O): uposixunix.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ uposixwin$(O): uposixwin.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ uregex$(O): uregex.c chicken.h $(CHICKEN_CONFIG_H) 
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ usrfi-1$(O): usrfi-1.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ usrfi-13$(O): usrfi-13.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ usrfi-14$(O): usrfi-14.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ usrfi-18$(O): usrfi-18.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ usrfi-69$(O): usrfi-69.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ usrfi-4$(O): usrfi-4.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ utcp$(O): utcp.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ uutils$(O): uutils.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ 
+ runtime-static$(O): runtime.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ gui-runtime-static$(O): runtime.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $(C_COMPILER_GUI_RUNTIME_OPTIONS) $< \
+ 	  $(C_COMPILER_OUTPUT)
+ eval-static$(O): eval.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ expand-static$(O): expand.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ chicken-syntax-static$(O): chicken-syntax.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ data-structures-static$(O): data-structures.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ ports-static$(O): ports.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ files-static$(O): files.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ extras-static$(O): extras.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ library-static$(O): library.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ lolevel-static$(O): lolevel.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ posixunix-static$(O): posixunix.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ posixwin-static$(O): posixwin.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ profiler-static$(O): profiler.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ regex-static$(O): regex.c chicken.h $(CHICKEN_CONFIG_H) 
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ scheduler-static$(O): scheduler.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ srfi-1-static$(O): srfi-1.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ srfi-13-static$(O): srfi-13.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ srfi-14-static$(O): srfi-14.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ srfi-18-static$(O): srfi-18.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ srfi-69-static$(O): srfi-69.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ srfi-4-static$(O): srfi-4.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ stub-static$(O): stub.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ tcp-static$(O): tcp.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ utils-static$(O): utils.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ 
+ uruntime-static$(O): runtime.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ ueval-static$(O): ueval.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ udata-structures-static$(O): udata-structures.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ uports-static$(O): uports.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ ufiles-static$(O): ufiles.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ uextras-static$(O): uextras.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ ulibrary-static$(O): ulibrary.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ ulolevel-static$(O): ulolevel.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ uposixunix-static$(O): uposixunix.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ uposixwin-static$(O): uposixwin.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ uregex-static$(O): uregex.c chicken.h $(CHICKEN_CONFIG_H) 
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ usrfi-1-static$(O): usrfi-1.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ usrfi-13-static$(O): usrfi-13.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ usrfi-14-static$(O): usrfi-14.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ usrfi-18-static$(O): usrfi-18.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ usrfi-69-static$(O): usrfi-69.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ usrfi-4-static$(O): usrfi-4.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ utcp-static$(O): utcp.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ uutils-static$(O): uutils.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_BUILD_UNSAFE_RUNTIME_OPTIONS) $< $(C_COMPILER_OUTPUT)
+@@ -564,112 +564,112 @@
+ # compiler objects
+ 
+ batch-driver$(O): batch-driver.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) $< \
+ 	  $(C_COMPILER_OUTPUT)
+ c-backend$(O): c-backend.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) $< \
+ 	  $(C_COMPILER_OUTPUT)
+ c-platform$(O): c-platform.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) $< \
+ 	  $(C_COMPILER_OUTPUT)
+ optimizer$(O): optimizer.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) $< \
+ 	  $(C_COMPILER_OUTPUT)
+ scrutinizer$(O): scrutinizer.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) $< \
+ 	  $(C_COMPILER_OUTPUT)
+ chicken$(O): chicken.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) $< \
+ 	  $(C_COMPILER_OUTPUT)
+ compiler$(O): compiler.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) $< \
+ 	  $(C_COMPILER_OUTPUT)
+ support$(O): support.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(C_COMPILER_SHARED_OPTIONS) $< \
+ 	  $(C_COMPILER_OUTPUT)
+ 
+ # static compiler objects
+ 
+ batch-driver-static$(O): batch-driver.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ c-backend-static$(O): c-backend.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ c-platform-static$(O): c-platform.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ chicken-static$(O): chicken.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ compiler-static$(O): compiler.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ support-static$(O): support.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ optimizer-static$(O): optimizer.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ scrutinizer-static$(O): scrutinizer.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ 
+ # assembler objects
+ 
+ ifneq ($(HACKED_APPLY),)
+-$(APPLY_HACK_OBJECT): $(SRCDIR)apply-hack.$(ARCH).s
++$(APPLY_HACK_OBJECT): $(SRCDIR)apply-hack.$(ARCH)$(ASM)
+ 	$(ASSEMBLER) $(ASSEMBLER_OPTIONS) $(ASSEMBLER_COMPILE_OPTION) $< $(ASSEMBLER_OUTPUT)
+ endif
+ 
+ # program objects
+ 
+ chicken-profile$(O): chicken-profile.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) $(C_COMPILER_SHARED_OPTIONS) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ chicken-install$(O): chicken-install.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) $(C_COMPILER_SHARED_OPTIONS) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ chicken-uninstall$(O): chicken-uninstall.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) $(C_COMPILER_SHARED_OPTIONS) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ chicken-status$(O): chicken-status.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) $(C_COMPILER_SHARED_OPTIONS) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ chicken-setup$(O): chicken-setup.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) $(C_COMPILER_SHARED_OPTIONS) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ csc$(O): csc.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) $(C_COMPILER_SHARED_OPTIONS) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ csi$(O): csi.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) $(C_COMPILER_SHARED_OPTIONS) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) $(C_COMPILER_SHARED_OPTIONS) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ 
+ # static program objects
+ 
+ csi-static$(O): csi.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(INCLUDES) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ chicken-bug$(O): chicken-bug.c chicken.h $(CHICKEN_CONFIG_H)
+-	$(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_PTABLES_OPTIONS) $(INCLUDES) \
++	$(C_COMPILER) $(C_COMPILER_OPTIONS)  $(INCLUDES) \
+ 	  $(C_COMPILER_STATIC_OPTIONS) \
+ 	  $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $< $(C_COMPILER_OUTPUT)
+ 
+@@ -682,11 +682,16 @@
+ libchicken$(SO): $(LIBCHICKEN_SHARED_OBJECTS) $(APPLY_HACK_OBJECT)
+ 	$(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_LIBRARY_OPTIONS) $(LIBCHICKEN_SO_LINKER_OPTIONS) \
+ 	  $(LINKER_OUTPUT) $^ $(LIBCHICKEN_SO_LIBRARIES)
+-
++ifdef USES_SONAME
++	ln -sf $(LIBCHICKEN_SO_FILE) $(LIBCHICKEN_SO_FILE).$(BINARYVERSION)
++endif
+ 
+ libuchicken$(SO): $(LIBUCHICKEN_SHARED_OBJECTS) $(APPLY_HACK_OBJECT)
+ 	$(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_LIBRARY_OPTIONS) $(LIBUCHICKEN_SO_LINKER_OPTIONS) \
+ 	  $(LINKER_OUTPUT) $^ $(LIBUCHICKEN_SO_LIBRARIES)
++ifdef USES_SONAME
++	ln -sf $(LIBUCHICKEN_SO_FILE) $(LIBUCHICKEN_SO_FILE).$(BINARYVERSION)
++endif
+ 
+ cygchicken-0.dll: $(LIBCHICKEN_SHARED_OBJECTS) $(APPLY_HACK_OBJECT)
+ 	gcc -shared -o $(LIBCHICKEN_SO_FILE) -Wl,--dll -Wl,--add-stdcall-alias \
+@@ -791,17 +796,10 @@
+ endif
+ endif
+ ifneq ($(POSTINSTALL_STATIC_LIBRARY),true)
+-ifdef WINDOWS
+-	$(POSTINSTALL_STATIC_LIBRARY) $(POSTINSTALL_STATIC_LIBRARY_FLAGS) \
+-	  $(ILIBDIR)\\libchicken$(A)
+-	$(POSTINSTALL_STATIC_LIBRARY) $(POSTINSTALL_STATIC_LIBRARY_FLAGS) \
+-	  $(ILIBDIR)\\libuchicken$(A)
+-else
+ 	$(POSTINSTALL_STATIC_LIBRARY) $(POSTINSTALL_STATIC_LIBRARY_FLAGS) \
+-	  $(ILIBDIR)/libchicken$(A)
++	  $(ILIBDIR)$(SEP)libchicken$(A)
+ 	$(POSTINSTALL_STATIC_LIBRARY) $(POSTINSTALL_STATIC_LIBRARY_FLAGS) \
+-	  $(ILIBDIR)/libuchicken$(A)
+-endif
++	  $(ILIBDIR)$(SEP)libuchicken$(A)
+ endif
+ 	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)chicken.h $(DESTDIR)$(IINCDIR)
+ 	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(CHICKEN_CONFIG_H) $(DESTDIR)$(IINCDIR)
+@@ -810,12 +808,18 @@
+ 	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS) $(LIBCHICKEN_SO_FILE) $(DESTDIR)$(IBINDIR)
+ 	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS) $(LIBUCHICKEN_SO_FILE) $(DESTDIR)$(IBINDIR)
+ else
+-	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS) $(LIBCHICKEN_SO_FILE) $(DESTDIR)$(ILIBDIR)
+-	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS) $(LIBUCHICKEN_SO_FILE) $(DESTDIR)$(ILIBDIR)
++	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS) $(LIBCHICKEN_SO_FILE) \
++	  $(DESTDIR)$(ILIBDIR)$(SEP)$(LIBCHICKEN_SO_FILE)$(SONAME_VERSION)
++	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS) $(LIBUCHICKEN_SO_FILE) \
++	  $(DESTDIR)$(ILIBDIR)$(SEP)$(LIBUCHICKEN_SO_FILE)$(SONAME_VERSION)
+ endif
+ ifdef WINDOWS
+ 	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS) libchickengui$(SO) $(DESTDIR)$(IBINDIR)
+ endif
++ifdef USES_SONAME
++	cd $(DESTDIR)$(ILIBDIR) && ln -sf $(LIBCHICKEN_SO_FILE).$(BINARYVERSION) libchicken$(SO)
++	cd $(DESTDIR)$(ILIBDIR) && ln -sf $(LIBUCHICKEN_SO_FILE).$(BINARYVERSION) libuchicken$(SO)
++endif
+ endif
+ 
+ install-dirs:
+@@ -838,8 +842,10 @@
+ 	  $(CSI_PROGRAM)$(EXE) $(CSC_PROGRAM)$(EXE) $(CHICKEN_PROFILE_PROGRAM)$(EXE) \
+ 	  $(CHICKEN_INSTALL_PROGRAM)$(EXE) $(CHICKEN_UNINSTALL_PROGRAM)$(EXE) \
+ 	  $(CHICKEN_STATUS_PROGRAM)$(EXE) $(CHICKEN_SETUP_PROGRAM)$(EXE) \
++	  $(LIBCHICKEN_SO_FILE) $(LIBUCHICKEN_SO_FILE) \
+ 	  $(IMPORT_LIBRARIES:%=%.so) $(IMPORT_LIBRARIES:%=%.import.so)
+-	$(MAKE) -f $(SRCDIR)Makefile.$(PLATFORM) NEEDS_RELINKING=no RUNTIME_LINKER_PATH=$(LIBDIR) install
++	$(MAKE) -f $(SRCDIR)Makefile.$(PLATFORM) NEEDS_RELINKING=no RUNTIME_LINKER_PATH=$(LIBDIR) \
++	  SONAME_VERSION=.$(BINARYVERSION) install
+ 	$(MAKE_WRITABLE_COMMAND) $(CHICKEN_PROGRAM)$(EXE) $(CSI_PROGRAM)$(EXE) \
+ 	  $(CSC_PROGRAM)$(EXE) $(CHICKEN_PROFILE_PROGRAM)$(EXE)
+ ifndef STATICBUILD
+@@ -856,35 +862,35 @@
+ 	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_EXECUTABLE_OPTIONS) $(CSC_PROGRAM)$(EXE) $(DESTDIR)$(IBINDIR)
+ 	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_EXECUTABLE_OPTIONS) $(CHICKEN_BUG_PROGRAM)$(EXE) $(DESTDIR)$(IBINDIR)
+ ifneq ($(POSTINSTALL_PROGRAM),true)
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IBINDIR)/$(CHICKEN_PROGRAM)
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IBINDIR)/$(CSI_PROGRAM)
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IBINDIR)/$(CHICKEN_PROFILE_PROGRAM)
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IBINDIR)/$(CSC_PROGRAM)
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IBINDIR)/$(CHICKEN_BUG_PROGRAM)
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)/setup-api.so
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)/setup-download.so
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)/setup-api.import.so
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)/setup-download.import.so
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)/chicken.import.so
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)/lolevel.import.so
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)/srfi-1.import.so
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)/srfi-4.import.so
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)/data-structures.import.so
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)/ports.import.so
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)/files.import.so
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)/posix.import.so
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)/srfi-13.import.so
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)/srfi-69.import.so
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)/extras.import.so
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)/regex.import.so
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)/irregex.import.so
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)/srfi-14.import.so
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)/tcp.import.so
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)/foreign.import.so
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)/scheme.import.so
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)/csi.import.so
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)/srfi-18.import.so
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)/utils.import.so
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_PROGRAM)
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IBINDIR)$(SEP)$(CSI_PROGRAM)
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_PROFILE_PROGRAM)
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IBINDIR)$(SEP)$(CSC_PROGRAM)
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_BUG_PROGRAM)
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)$(SEP)setup-api.so
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)$(SEP)setup-download.so
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)$(SEP)setup-api.import.so
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)$(SEP)setup-download.import.so
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)$(SEP)chicken.import.so
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)$(SEP)lolevel.import.so
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)$(SEP)srfi-1.import.so
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)$(SEP)srfi-4.import.so
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)$(SEP)data-structures.import.so
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)$(SEP)ports.import.so
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)$(SEP)files.import.so
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)$(SEP)posix.import.so
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)$(SEP)srfi-13.import.so
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)$(SEP)srfi-69.import.so
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)$(SEP)extras.import.so
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)$(SEP)regex.import.so
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)$(SEP)irregex.import.so
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)$(SEP)srfi-14.import.so
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)$(SEP)tcp.import.so
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)$(SEP)foreign.import.so
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)$(SEP)scheme.import.so
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)$(SEP)csi.import.so
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)$(SEP)srfi-18.import.so
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IEGGDIR)$(SEP)utils.import.so
+ endif
+ ifndef STATICBUILD
+ 	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_EXECUTABLE_OPTIONS) $(CHICKEN_INSTALL_PROGRAM)$(EXE) $(DESTDIR)$(IBINDIR)
+@@ -892,12 +898,12 @@
+ 	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_EXECUTABLE_OPTIONS) $(CHICKEN_STATUS_PROGRAM)$(EXE) $(DESTDIR)$(IBINDIR)
+ 	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_EXECUTABLE_OPTIONS) $(CHICKEN_SETUP_PROGRAM)$(EXE) $(DESTDIR)$(IBINDIR)
+ ifneq ($(POSTINSTALL_PROGRAM),true)
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IBINDIR)/$(CHICKEN_INSTALL_PROGRAM)
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IBINDIR)/$(CHICKEN_UNINSTALL_PROGRAM)
+-	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IBINDIR)/$(CHICKEN_STATUS_PROGRAM)
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_INSTALL_PROGRAM)
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_UNINSTALL_PROGRAM)
++	$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) $(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_STATUS_PROGRAM)
+ endif
+ # this might be left over from older version and will break `chicken-install -update-db'
+-	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(IEGGDIR)/compiler.import.so
++	-$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(IEGGDIR)$(SEP)compiler.import.so
+ ifneq ($(CROSS_CHICKEN),1)
+ ifeq ($(DESTDIR),)
+ 	-$(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_INSTALL_PROGRAM) -update-db
+@@ -983,23 +989,39 @@
+ 	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_EXECUTABLE_OPTIONS) setup-download.so $(DESTDIR)$(IEGGDIR)
+ 
+ uninstall:
+-	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(IBINDIR)/$(CHICKEN_PROGRAM)$(EXE) \
+-	  $(DESTDIR)$(IBINDIR)/$(CSI_PROGRAM)$(EXE) $(DESTDIR)$(IBINDIR)/$(CHICKEN_PROFILE_PROGRAM)$(EXE) \
+-	  $(DESTDIR)$(IBINDIR)/$(CHICKEN_INSTALL_PROGRAM)$(EXE) \
+-	  $(DESTDIR)$(IBINDIR)/$(CHICKEN_UNINSTALL_PROGRAM)$(EXE) \
+-	  $(DESTDIR)$(IBINDIR)/$(CHICKEN_STATUS_PROGRAM)$(EXE) \
+-	  $(DESTDIR)$(IBINDIR)/$(CSC_PROGRAM)$(EXE) \
+-	  $(DESTDIR)$(IBINDIR)/$(CHICKEN_BUG_PROGRAM)$(EXE)
+-	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(ILIBDIR)/libchicken*.* $(DESTDIR)$(ILIBDIR)/libuchicken*.* $(DESTDIR)$(IBINDIR)/libchicken*.* $(DESTDIR)$(IBINDIR)/libuchicken*.*
++	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_PROGRAM)$(EXE) \
++	  $(DESTDIR)$(IBINDIR)$(SEP)$(CSI_PROGRAM)$(EXE) $(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_PROFILE_PROGRAM)$(EXE) \
++	  $(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_INSTALL_PROGRAM)$(EXE) \
++	  $(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_UNINSTALL_PROGRAM)$(EXE) \
++	  $(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_STATUS_PROGRAM)$(EXE) \
++	  $(DESTDIR)$(IBINDIR)$(SEP)$(CSC_PROGRAM)$(EXE) \
++	  $(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_BUG_PROGRAM)$(EXE) \
++	  $(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_SETUP_PROGRAM)$(EXE)
++	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(ILIBDIR)$(SEP)libchicken$(A) 
++	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(ILIBDIR)$(SEP)libuchicken$(A) 
++	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(ILIBDIR)$(SEP)libchicken$(SO)
++	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(ILIBDIR)$(SEP)libuchicken$(SO)
++ifdef USES_SONAME
++	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(ILIBDIR)$(SEP)libchicken$(SO).$(BINARYVERSION)
++	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(ILIBDIR)$(SEP)libuchicken$(SO).$(BINARYVERSION)
++endif
++ifdef WINDOWS
++	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(IBINDIR)$(SEP)libchicken$(SO)
++	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(IBINDIR)$(SEP)libuchicken$(SO)
++	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(IBINDIR)$(SEP)libchickengui$(SO)
++	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(ILIBDIR)$(SEP)libchickengui$(A)
++	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(ILIBDIR)$(SEP)$(LIBCHICKEN_IMPORT_LIBRARY)
++	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(ILIBDIR)$(SEP)$(LIBUCHICKEN_IMPORT_LIBRARY)
++	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(ILIBDIR)$(SEP)$(LIBCHICKENGUI_IMPORT_LIBRARY)
++endif
+ ifdef ($(PLATFORM),cygwin)
+-	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(IBINDIR)/cygchicken* $(DESTDIR)$(IBINDIR)/cyguchicken*
++	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(IBINDIR)$(SEP)cygchicken* $(DESTDIR)$(IBINDIR)$(SEP)cyguchicken*
+ endif
+-	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(IMANDIR)/chicken.1 $(DESTDIR)$(IMANDIR)/csi.1 \
+-	  $(DESTDIR)$(IMANDIR)/csc.1 $(DESTDIR)$(IMANDIR)/chicken-profile.1 $(DESTDIR)$(IMANDIR)/chicken-install.1 \
+-	  $(DESTDIR)$(IMANDIR)/chicken-bug.1 $(DESTDIR)$(IMANDIR)/chicken-uninstall.1 \
+-	  $(DESTDIR)$(IMANDIR)/chicken-status.1
+-	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(IINCDIR)/chicken.h $(DESTDIR)$(IINCDIR)/chicken-config.h
+-	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(IINCDIR)/chicken.gch 
++	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(IMANDIR)$(SEP)chicken.1 $(DESTDIR)$(IMANDIR)$(SEP)csi.1 \
++	  $(DESTDIR)$(IMANDIR)$(SEP)csc.1 $(DESTDIR)$(IMANDIR)$(SEP)chicken-profile.1 $(DESTDIR)$(IMANDIR)$(SEP)chicken-install.1 \
++	  $(DESTDIR)$(IMANDIR)$(SEP)chicken-bug.1 $(DESTDIR)$(IMANDIR)$(SEP)chicken-uninstall.1 \
++	  $(DESTDIR)$(IMANDIR)$(SEP)chicken-status.1
++	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(IINCDIR)$(SEP)chicken.h $(DESTDIR)$(IINCDIR)$(SEP)chicken-config.h
+ 	$(REMOVE_COMMAND) $(REMOVE_COMMAND_RECURSIVE_OPTIONS) $(DESTDIR)$(IDATADIR)
+ ifdef WINDOWS_SHELL
+ 	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(DESTDIR)$(IBINDIR)$(SEP)csibatch.bat
+@@ -1205,16 +1227,17 @@
+ 	uutils.c utcp.c usrfi-1.c usrfi-4.c usrfi-13.c usrfi-14.c \
+ 	usrfi-18.c usrfi-69.c uposixunix.c uposixwin.c uregex.c \
+ 	chicken-profile.c chicken-install.c chicken-uninstall.c chicken-status.c chicken-setup.c \
+-	csc.c csi.c chicken.c batch-driver.c compiler.c optimizer.c scrutinizer.c support.c \
++	csc.c csi.c chicken.c batch-driver.c compiler.c optimizer.c  \
++	scrutinizer.c support.c \
+ 	c-platform.c c-backend.c chicken-bug.c $(IMPORT_LIBRARIES:=.import.c)
+ 
+ dist: distfiles
+-	CSI=$(CSI) $(CSI) -s $(SRCDIR)scripts/makedist.scm --platform=$(PLATFORM) CHICKEN=$(CHICKEN)
++	CSI=$(CSI) $(CSI) -s $(SRCDIR)scripts$(SEP)makedist.scm --platform=$(PLATFORM) CHICKEN=$(CHICKEN)
+ 
+ html:
+ 	$(MAKEDIR_COMMAND) $(MAKEDIR_COMMAND_OPTIONS) $(SRCDIR)html
+-	$(COPY_COMMAND) $(SRCDIR)misc/manual.css $(SRCDIR)html
+-	$(CSI) -s $(SRCDIR)scripts/wiki2html.scm --outdir=html manual/*
++	$(COPY_COMMAND) $(SRCDIR)misc$(SEP)manual.css $(SRCDIR)html
++	$(CSI) -s $(SRCDIR)scripts$(SEP)wiki2html.scm --outdir=html manual$(SEP)*
+ 
+ # cleaning up
+ 
+@@ -1234,8 +1257,12 @@
+ 	  $(LIBCHICKEN_SO_FILE) $(LIBUCHICKEN_SO_FILE) $(LIBCHICKENGUI_SO_FILE) \
+ 	  libchicken$(A) libuchicken$(A) libchickengui$(A) libchicken$(SO) $(PROGRAM_IMPORT_LIBRARIES) \
+ 	  $(IMPORT_LIBRARIES:=.import.so) $(LIBCHICKEN_IMPORT_LIBRARY) $(LIBUCHICKEN_IMPORT_LIBRARY) \
+-	  $(LIBCHICKENGUI_IMPORT_LIBRARY) setup-api.so setup-download.so setup-api.c setup-download.c \
++	  $(LIBCHICKENGUI_IMPORT_LIBRARY) setup-api.so setup-download.so \
+ 	  $(CLEAN_MINGW_LIBS)
++ifdef USES_SONAME
++	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) libchicken.so.$(BINARYVERSION)
++	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) libuchicken.so.$(BINARYVERSION)
++endif
+ 
+ confclean:
+ 	-$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) chicken-config.h chicken-defaults.h buildsvnrevision
+@@ -1249,15 +1276,16 @@
+ 	  uutils.c utcp.c usrfi-1.c usrfi-4.c usrfi-13.c usrfi-14.c \
+ 	  usrfi-18.c usrfi-69.c uposixunix.c uposixwin.c uregex.c chicken-profile.c chicken-bug.c \
+ 	  csc.c csi.c chicken-install.c chicken-setup.c chicken-uninstall.c chicken-status.c \
+-	  chicken.c batch-driver.c compiler.c optimizer.c scrutinizer.c support.c \
+-	  c-platform.c c-backend.c chicken-boot$(EXE) \
++	  chicken.c batch-driver.c compiler.c optimizer.c \
++	  scrutinizer.c support.c \
++	  c-platform.c c-backend.c chicken-boot$(EXE) setup-api.c setup-download.c \
+ 	  $(IMPORT_LIBRARIES:=.import.c)
+ 
+ distclean: clean confclean
+ 
+ testclean:
+-	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(SRCDIR)tests/*.out $(SRCDIR)tests/tmp* \
+-	  $(SRCDIR)tests/*.so $(SRCDIR)tests/*.import.scm $(SRCDIR)tests/repository
++	$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(SRCDIR)tests$(SEP)a.out $(SRCDIR)tests$(SEP)scrutiny.out \
++	  $(SRCDIR)tests$(SEP)tmp* $(SRCDIR)tests$(SEP)*.so $(SRCDIR)tests$(SEP)*.import.scm $(SRCDIR)tests$(SEP)repository
+ 
+ # run tests
+ 
+@@ -1273,19 +1301,19 @@
+ compiler-check:
+ 	@echo "======================================== packing ..."
+ 	$(MAKE) -f $(SRCDIR)Makefile.$(PLATFORM) dist
+-	$(REMOVE_COMMAND $(REMOVE_COMMAND_RECURSIVE_OPTIONS) tests/chicken-*
++	$(REMOVE_COMMAND $(REMOVE_COMMAND_RECURSIVE_OPTIONS) tests$(SEP)chicken-*
+ 	tar -C tests -xzf `ls -t chicken-*.tar.gz | head -1`
+ 	@echo "======================================== building stage 1 ..."
+-	$(MAKE) -f $(SRCDIR)Makefile.$(PLATFORM) STATICBUILD=1 -C tests/chicken-* confclean all
+-	touch tests/chicken-*/*.scm
++	$(MAKE) -f $(SRCDIR)Makefile.$(PLATFORM) STATICBUILD=1 -C tests$(SEP)chicken-* confclean all
++	touch tests$(SEP)chicken-*$(SEP)*.scm
+ 	@echo "======================================== building stage 2 ..."
+-	$(MAKE) -f $(SRCDIR)Makefile.$(PLATFORM) STATICBUILD=1 -C tests/chicken-* confclean all
+-	cat tests/chicken-*/*.c >tests/stage2.out
++	$(MAKE) -f $(SRCDIR)Makefile.$(PLATFORM) STATICBUILD=1 -C tests$(SEP)chicken-* confclean all
++	cat tests$(SEP)chicken-*$(SEP)*.c >tests$(SEP)stage2.out
+ 	@echo "======================================== building stage 3 ..."
+-	$(MAKE) -f $(SRCDIR)Makefile.$(PLATFORM) STATICBUILD=1 -C tests/chicken-* confclean all	
+-	cat tests/chicken-*/*.c >tests/stage3.out
+-	diff tests/stage2.out tests/stage3.out >tests/stages.diff
+-	$(REMOVE_COMMAND) $(REMOVE_COMMAND_RECURSIVE_OPTIONS) tests/chicken-*
++	$(MAKE) -f $(SRCDIR)Makefile.$(PLATFORM) STATICBUILD=1 -C tests$(SEP)chicken-* confclean all	
++	cat tests$(SEP)chicken-*$(SEP)*.c >tests$(SEP)stage3.out
++	diff tests$(SEP)stage2.out tests$(SEP)stage3.out >tests$(SEP)stages.diff
++	$(REMOVE_COMMAND) $(REMOVE_COMMAND_RECURSIVE_OPTIONS) tests$(SEP)chicken-*
+ 
+ 
+ # bootstrap from C source tarball
+@@ -1313,7 +1341,7 @@
+ .PHONY: bench
+ 
+ bench:
+-	here=`pwd`; \
++	@here=`pwd`; \
+ 	cd $(SRCDIR)benchmarks; \
+ 	LD_LIBRARY_PATH=$$here DYLD_LIBRARY_PATH=$$here PATH=$$here:$$PATH \
+ 	$(CSI) -s cscbench.scm $(BENCHMARK_OPTIONS)
diff --git a/recipes/chicken/chicken.inc b/recipes/chicken/chicken.inc
index ff8da65683..1622d3715d 100644
--- a/recipes/chicken/chicken.inc
+++ b/recipes/chicken/chicken.inc
@@ -7,8 +7,6 @@ INC_PR = "r1"
 
 SRC_URI = "http://chicken.wiki.br/releases/${PV}/chicken-${PV}.tar.gz"
 
-inherit autotools
-
 # Parallel building is not supported
 PARALLEL_MAKE = ""
 
@@ -16,12 +14,9 @@ PARALLEL_MAKE = ""
 export PLATFORM="linux"
 export PREFIX="${prefix}"
 export C_COMPILER="${TARGET_PREFIX}gcc ${LDFLAGS} "
-export LIBRARIAN="${TARGET_PREIX}ar "
+export LIBRARIAN="${TARGET_PREFIX}ar "
 export TARGETSYSTEM="${TARGET_SYS}"
 
-SONAME = "${@bb.data.getVar("PV", d, 1)[0]}"
-ASSUME_SHLIBS += "libchicken.so.${SONAME}:libchicken libuchicken.so.${SONAME}:libuchicken"
-
 do_compile() {
 	case ${TARGET_ARCH} in
 	i*86)
@@ -50,22 +45,11 @@ do_install() {
     make ARCH=${ARCH} DESTDIR=${D} install
 }
 
-do_install_append() {
-    # Handle lacking of soname is some versions
-    if [ ! -e ${D}${libdir}/libchicken.so.${SONAME} ]; then
-        (cd ${D}${libdir}
-         mv libchicken.so libchicken.so.${SONAME}
-         ln -s libchicken.so.${SONAME} libchicken.so
-         mv libuchicken.so libuchicken.so.${SONAME}
-         ln -s libuchicken.so.${SONAME} libuchicken.so)
-    fi
-}
-
 PACKAGES += "chicken-bin libchicken libuchicken"
 
 FILES_${PN} = ""
-FILES_libchicken = "${libdir}/libchicken.so.${SONAME}"
-FILES_libuchicken = "${libdir}/libuchicken.so.${SONAME}*"
-FILES_${PN}-bin = "${bindir}/* ${datadir}/chicken/*.* ${libdir}/chicken/${SONAME}/*.so"
+FILES_libchicken = "${libdir}/libchicken.so.*"
+FILES_libuchicken = "${libdir}/libuchicken.so.*"
+FILES_${PN}-bin = "${bindir}/* ${datadir}/chicken/*.* ${libdir}/chicken/*/*.so"
 FILES_${PN}-doc += "${datadir}/chicken/doc"
 FILES_${PN}-dbg += "${libdir}/chicken/*/.debug"
diff --git a/recipes/chicken/chicken_4.2.0.bb b/recipes/chicken/chicken_4.2.0.bb
index c61d655ab5..473c7ad817 100644
--- a/recipes/chicken/chicken_4.2.0.bb
+++ b/recipes/chicken/chicken_4.2.0.bb
@@ -1,3 +1,5 @@
 require chicken.inc
 
+SRC_URI += "file://soname.patch;patch=1"
+
 PR = "${INC_PR}.1"