--- callback/trampoline_r/Makefile.in.orig	2013-02-26 09:57:59.000000000 +0100
+++ callback/trampoline_r/Makefile.in	2013-02-26 09:59:17.000000000 +0100
@@ -25,7 +25,7 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 INCLUDES = -I. -I$(srcdir)
-ASPFLAGS = `if test @AS_UNDERSCORE@ = true; then echo '-DASM_UNDERSCORE'; fi`
+ASPFLAGS = $(CPPFLAGS) `if test @AS_UNDERSCORE@ = true; then echo '-DASM_UNDERSCORE'; fi`
 LIBTOOL = @LIBTOOL@
 LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile
 LIBTOOL_LINK = $(LIBTOOL) --mode=link
@@ -61,60 +61,60 @@
 	$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) $(INCLUDES) -c $(srcdir)/trampoline.c
 
 tramp-hppa.lo : $(srcdir)/tramp-hppa.s
-	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/tramp-hppa.s
+	$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) @GCC_X_NONE@ -c $(srcdir)/tramp-hppa.s
 
 tramp-s390.lo : $(srcdir)/tramp-s390.s
-	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/tramp-s390.s
+	$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) @GCC_X_NONE@ -c $(srcdir)/tramp-s390.s
 
 tramp-powerpc.lo : tramp-powerpc.s
-	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c tramp-powerpc.s
+	$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) @GCC_X_NONE@ -c tramp-powerpc.s
 
 tramp-powerpc.s : $(srcdir)/tramp-powerpc.old.S $(srcdir)/tramp-powerpc.new.S
 	case "$(OS)" in \
 	  aix3*) syntax=old;; \
 	  *) syntax=new;; \
 	esac; \
-	$(CPP) $(srcdir)/tramp-powerpc.$${syntax}.S > tramp-powerpc.s
+	$(CPP) $(CPPFLAGS) $(srcdir)/tramp-powerpc.$${syntax}.S > tramp-powerpc.s
 
 tramp-powerpc64.lo : tramp-powerpc64.s
-	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c tramp-powerpc64.s
+	$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) @GCC_X_NONE@ -c tramp-powerpc64.s
 
 tramp-powerpc64.s : $(srcdir)/tramp-powerpc64.new.S
-	$(CPP) $(srcdir)/tramp-powerpc64.new.S > tramp-powerpc64.s
+	$(CPP) $(CPPFLAGS) $(srcdir)/tramp-powerpc64.new.S > tramp-powerpc64.s
 
 tramp-ia64.lo : $(srcdir)/tramp-ia64.s
-	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/tramp-ia64.s
+	$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) @GCC_X_NONE@ -c $(srcdir)/tramp-ia64.s
 
 cache-sparc.lo : cache-sparc.s
-	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c cache-sparc.s
+	$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) @GCC_X_NONE@ -c cache-sparc.s
 
 cache-sparc.s : $(srcdir)/cache-sparc.S
 	$(CPP) $(ASPFLAGS) $(srcdir)/cache-sparc.S | grep -v '^ *#line' | grep -v '^#' | sed -e 's,% ,%,g' -e 's,//.*$$,,' -e 's,\$$,#,g' > cache-sparc.s
 
 cache-sparc64.lo : cache-sparc64.s
-	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c cache-sparc64.s
+	$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) @GCC_X_NONE@ -c cache-sparc64.s
 
 cache-sparc64.s : $(srcdir)/cache-sparc.S
 	$(CPP) $(ASPFLAGS) $(srcdir)/cache-sparc.S | grep -v '^ *#line' | grep -v '^#' | sed -e 's,% ,%,g' -e 's,//.*$$,,' -e 's,\$$,#,g' > cache-sparc64.s
 
 cache-alpha.lo : $(srcdir)/cache-alpha.s
-	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-alpha.s
+	$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) @GCC_X_NONE@ -c $(srcdir)/cache-alpha.s
 
 cache-arm.lo : $(srcdir)/cache-arm.s
-	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-arm.s
+	$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) @GCC_X_NONE@ -c $(srcdir)/cache-arm.s
 
 cache-armel.lo : $(srcdir)/cache-armel.s
-	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-armel.s
+	$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) @GCC_X_NONE@ -c $(srcdir)/cache-armel.s
 
 cache-hppa.lo : $(srcdir)/cache-hppa.s
-	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-hppa.s
+	$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) @GCC_X_NONE@ -c $(srcdir)/cache-hppa.s
 
 cache-powerpc.lo : $(srcdir)/cache-powerpc-sysv4.s $(srcdir)/cache-powerpc-macos.s
 	case "$(OS)" in \
 	  macos* | darwin*) syntax=macos;; \
 	  *) syntax=sysv4;; \
 	esac; \
-	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-powerpc-$${syntax}.s ; \
+	$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) @GCC_X_NONE@ -c $(srcdir)/cache-powerpc-$${syntax}.s ; \
 	cp cache-powerpc-$${syntax}.lo cache-powerpc.lo ; rm -f cache-powerpc-$${syntax}.lo ; \
 	if test -f cache-powerpc-$${syntax}.o; then cp cache-powerpc-$${syntax}.o cache-powerpc.o; fi
 # Note that cache-powerpc-${syntax}.o is kept in place, because in some cases
@@ -122,10 +122,10 @@
 # libtool may want to access it.
 
 cache-convex.lo : $(srcdir)/cache-convex.s
-	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-convex.s
+	$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) @GCC_X_NONE@ -c $(srcdir)/cache-convex.s
 
 libtrampoline.la : $(OBJECTS)
-	$(LIBTOOL_LINK) $(CC) -static -o libtrampoline.la -rpath $(libdir) $(OBJECTS)
+	$(LIBTOOL_LINK) $(CC) $(CFLAGS) -static -o libtrampoline.la -rpath $(libdir) $(OBJECTS)
 
 # Installs the library and include files only. Typically called with only
 # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.