From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Sat, 8 Dec 2012 12:46:27 +0100
Subject: [PATCH] fix cross-compiling

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
 Makefile.in   |   31 ++++++++++++++++---------------
 mk/Compile.mk |    4 ++--
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 389a39c..a51b463 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,28 +29,29 @@ VERSION		:= @VERSION@
 # for CFLAGS
 WARN_FLAGS	:= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
 LFS_FLAGS	:= -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-X11_FLAGS	:= @X_CFLAGS@ @XFT_FLAGS@ -I/usr/X11R6/include/X11/fonts
+X11_FLAGS	:= @X_CFLAGS@ @XFT_FLAGS@ -I$(SYSROOT)/usr/include/X11 \
+			-I$(SYSROOT)/usr/include/X11/fonts
 LIB_FLAGS	:= -I. -I./vbistuff -I./x11 \
 		   -I$(srcdir)/jwz -I$(srcdir)/common -I$(srcdir)/console \
 		   -I$(srcdir)/x11 -I$(srcdir)/structs \
 		   -I$(srcdir)/libng -Llibng
 
 # various libraries
-ATHENA_LIBS	:= @X_LIBS@ @XFT_LIBS@ @LIBS@ @ATHENA@
+ATHENA_LIBS	:= @X_LIBS@ @XFT_LIBS@ @LIBS@ @ATHENA@ $(LDFLAGS_CUST)
 MOTIF_LIBS	:= @X_LIBS@ @XFT_LIBS@ @LIBS@ -lXm -lXmu -lXt @X_PRE_LIBS@ \
-		   -lXp -lXpm -lXext -lX11 @X_EXTRA_LIBS@
-THREAD_LIBS	:= @LIBPTHREAD@
-CURSES_LIBS	:= @LIBCURSES@
-LIRC_LIBS	:= @LIRC@
-OSS_LIBS	:= @LIBOSS@
-ALSA_LIBS	:= @LIBALSA@
-AA_LIBS		:= @AALIBS@
-QT_LIBS		:= @QTLIBS@
-VBI_LIBS	:= @LIBZVBI@
-GL_LIBS		:= @LIBGL@
-DV_LIBS		:= @LIBDV@
-FS_LIBS		:= -L@x_libraries@ @FSLIB@
-DLFLAGS		:= @DLFLAGS@
+		   -lXp -lXpm -lXext -lX11 @X_EXTRA_LIBS@ $(LDFLAGS_CUST)
+THREAD_LIBS	:= @LIBPTHREAD@ $(LDFLAGS_CUST)
+CURSES_LIBS	:= @LIBCURSES@ $(LDFLAGS_CUST)
+LIRC_LIBS	:= @LIRC@ $(LDFLAGS_CUST)
+OSS_LIBS	:= @LIBOSS@ $(LDFLAGS_CUST)
+ALSA_LIBS	:= @LIBALSA@ $(LDFLAGS_CUST)
+AA_LIBS		:= @AALIBS@ $(LDFLAGS_CUST)
+QT_LIBS		:= @QTLIBS@ $(LDFLAGS_CUST)
+VBI_LIBS	:= @LIBZVBI@ $(LDFLAGS_CUST)
+GL_LIBS		:= @LIBGL@ $(LDFLAGS_CUST)
+DV_LIBS		:= @LIBDV@ $(LDFLAGS_CUST)
+FS_LIBS		:= @FSLIB@ $(LDFLAGS_CUST)
+DLFLAGS		:= @DLFLAGS@ $(LDFLAGS_CUST)
 
 # stuff configure has found
 FOUND_AALIB	:= @FOUND_AALIB@
diff --git a/mk/Compile.mk b/mk/Compile.mk
index 75dadde..7771ef0 100644
--- a/mk/Compile.mk
+++ b/mk/Compile.mk
@@ -20,8 +20,8 @@ tmpdep		= mk/$(subst /,_,$*).tmp
 depfile		= mk/$(subst /,_,$*).dep
 depfiles	= mk/*.dep
 
-compile_c	= $(CC) $(CFLAGS) -Wp,-MD,$(tmpdep) -c -o $@ $<
-compile_cc	= $(CXX) $(CXXFLAGS) -Wp,-MD,$(tmpdep) -c -o $@ $<
+compile_c	= $(CC) $(CFLAGS) $(CPPFLAGS) -Wp,-MD,$(tmpdep) -c -o $@ $<
+compile_cc	= $(CXX) $(CXXFLAGS) $(CPPFLAGS) -Wp,-MD,$(tmpdep) -c -o $@ $<
 fixup_deps	= sed -e "s|.*\.o:|$@:|" < $(tmpdep) > $(depfile) && rm -f $(tmpdep)
 
 link_app	= $(CC) $(LDFLAGS) -o $@  $^ $(LDLIBS)