Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

64 files changed, 12038 insertions, 554 deletions

diff --git a/recipes/abiword/abiword-2.5.inc b/recipes/abiword/abiword-2.5.inc
index 09f61d0534..f4d654ea4c 100644
--- a/recipes/abiword/abiword-2.5.inc
+++ b/recipes/abiword/abiword-2.5.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) W
 HOMEPAGE = "http://www.abiword.org""
 SECTION = "x11/office"
 LICENSE = "GPLv2"
-DEPENDS     = "perl-native wv libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng libxml2"
+DEPENDS     = "asio goffice perl-native wv libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng libxml2"
 RDEPENDS    = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \
                glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
 
@@ -29,7 +29,7 @@ FILES_${PN} += " \
 		${datadir}/abiword-${SHRT_VER}/templates/Memo.awt \
 		${datadir}/abiword-${SHRT_VER}/templates/Press-Release.awt "
 
-inherit autotools pkgconfig
+inherit autotools gtk-icon-cache pkgconfig mime
 
 PARALLEL_MAKE = ""
 
@@ -54,6 +54,9 @@ do_install_append() {
 
 PACKAGES += " abiword-clipart abiword-icons abiword-strings abiword-systemprofiles abiword-templates "
 
+ALLOW_EMPTY_abiword-clipart = "1"
+ALLOW_EMPTY_abiword-icons = "1"
+
 FILES_abiword-clipart 		+= "${datadir}/abiword-${SHRT_VER}/clipart"
 FILES_abiword-icons 		+= "${datadir}/abiword-${SHRT_VER}/icons"
 FILES_abiword-strings 		+= "${datadir}/abiword-${SHRT_VER}/AbiWord/strings"
diff --git a/recipes/abiword/abiword_2.8.0.bb b/recipes/abiword/abiword_2.8.0.bb
new file mode 100644
index 0000000000..546e29cd64
--- /dev/null
+++ b/recipes/abiword/abiword_2.8.0.bb
@@ -0,0 +1,48 @@
+require abiword-2.5.inc
+
+PR = "r1"
+
+SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
+
+do_configure() {
+	autotools_do_configure
+}
+
+EXTRA_OECONF = " --disable-static  \
+                 --enable-plugins \
+                 --enable-collab-backend-xmpp \
+                 --enable-collab-backend-tcp \
+                 --enable-collab-backend-service \
+"
+
+RCONFLICTS = "abiword-embedded"
+
+FILES_${PN} 			+= "${datadir}/mime-info ${datadir}/abiword-${SHRT_VER}/ui ${datadir}/abiword-${SHRT_VER}/xsl* ${datadir}/abiword-${SHRT_VER}/mime-info ${datadir}/abiword-${SHRT_VER}/Pr*.xml"
+FILES_abiword-strings           += "${datadir}/abiword-${SHRT_VER}/strings"
+FILES_abiword-systemprofiles    += "${datadir}/abiword-${SHRT_VER}/system.profile*"
+
+PACKAGES_DYNAMIC = "abiword-meta abiword-plugin-*"
+
+python populate_packages_prepend () {
+	abiword_libdir    = bb.data.expand('${libdir}/abiword-2.8/plugins', d)
+	do_split_packages(d, abiword_libdir, '(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='')
+
+	metapkg = "abiword-meta"
+	bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d)
+	bb.data.setVar('FILES_' + metapkg, "", d)
+	blacklist = [ 'abiword-plugins-dbg', 'abiword-plugins', 'abiword-plugins-doc', 'abiword-plugins-dev', 'abiword-plugins-locale' ]
+	metapkg_rdepends = []
+	packages = bb.data.getVar('PACKAGES', d, 1).split()
+	for pkg in packages[1:]:
+		if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale") and not pkg.count("abiword-doc"):
+			print "Modifying ", pkg
+			metapkg_rdepends.append(pkg)
+	bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d)
+	bb.data.setVar('DESCRIPTION_' + metapkg, 'abiword-plugin meta package', d)
+	packages.append(metapkg)
+	bb.data.setVar('PACKAGES', ' '.join(packages), d)
+}
+
+FILES_${PN}-dev += "${libdir}/abiword-${SHRT_VER}/plugins/*.la"
+FILES_${PN}-dbg += "${libdir}/abiword-${SHRT_VER}/plugins/.debug"
+
diff --git a/recipes/angstrom/angstrom-gpe-task-settings.bb b/recipes/angstrom/angstrom-gpe-task-settings.bb
index 0280859fdc..953007b11b 100644
--- a/recipes/angstrom/angstrom-gpe-task-settings.bb
+++ b/recipes/angstrom/angstrom-gpe-task-settings.bb
@@ -1,12 +1,11 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r34"
+PR = "r35"
 
 inherit task
 
 RDEPENDS_${PN} = "\
     matchbox-panel-manager \
     mboxkbd-layouts-gui \
-    connman-gnome \
 	gpe-su \
     gpe-conf \
     gpe-package \
diff --git a/recipes/angstrom/angstrom-uboot-scripts/dsplink.cmd b/recipes/angstrom/angstrom-uboot-scripts/dsplink.cmd
new file mode 100644
index 0000000000..3ba551e015
--- /dev/null
+++ b/recipes/angstrom/angstrom-uboot-scripts/dsplink.cmd
@@ -0,0 +1,4 @@
+setenv vram '16M'
+setenv dvimode 'hd720 mem=88M@0x80000000 mem=128M@0x88000000 omapfb.vram=0:8M,1:4M,2:4M'
+run loaduimage
+run mmcboot
diff --git a/recipes/angstrom/angstrom-uboot-scripts/touchbook-vrfb.cmd b/recipes/angstrom/angstrom-uboot-scripts/touchbook-vrfb.cmd
new file mode 100644
index 0000000000..8991e704a4
--- /dev/null
+++ b/recipes/angstrom/angstrom-uboot-scripts/touchbook-vrfb.cmd
@@ -0,0 +1,4 @@
+mmcinit
+fatload mmc 0 0x82000000 uImage
+setenv bootargs 'console=tty1 omapfb.vrfb=1 omapfb.mode=dvi:1024x600MR-24@60 root=/dev/mmcblk0p2 rootwait rootfstype=ext3 mem=88M@0x80000000 mem=128M@0x88000000 vram=18M omapfb.vram=0:10M,1:4M,2:4M'
+bootm
diff --git a/recipes/angstrom/angstrom-uboot-scripts/touchbook.cmd b/recipes/angstrom/angstrom-uboot-scripts/touchbook.cmd
new file mode 100644
index 0000000000..4702d3f393
--- /dev/null
+++ b/recipes/angstrom/angstrom-uboot-scripts/touchbook.cmd
@@ -0,0 +1,4 @@
+mmcinit
+fatload mmc 0 0x82000000 uImage
+setenv bootargs 'console=tty1 omapfb.mode=dvi:1024x600MR-24@60 root=/dev/mmcblk0p2 rootwait rootfstype=ext3 mem=88M@0x80000000 mem=128M@0x88000000 vram=16M omapfb.vram=0:8M,1:4M,2:4M'
+bootm
diff --git a/recipes/asio/asio_1.1.1.bb b/recipes/asio/asio_1.1.1.bb
index 89b363dd8a..a724921676 100644
--- a/recipes/asio/asio_1.1.1.bb
+++ b/recipes/asio/asio_1.1.1.bb
@@ -4,6 +4,8 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "Boost Software License"
 
+DEPENDS = "boost"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${PN}-${PV}.tar.bz2"
 
 inherit autotools pkgconfig
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_OP