Make lguest_launcher.h types userspace-friendly

[safe/jmp/linux-2.6] / Documentation / lguest / Makefile

diff --git a/Documentation/lguest/Makefile b/Documentation/lguest/Makefile
index b9b9427..526c15f 100644 (file)
--- a/Documentation/lguest/Makefile
+++ b/Documentation/lguest/Makefile
@@ -11,10 +11,11 @@ endif
 include $(KBUILD_OUTPUT)/.config
 LGUEST_GUEST_TOP := ($(CONFIG_PAGE_OFFSET) - 0x08000000)
 
-CFLAGS:=-Wall -Wmissing-declarations -Wmissing-prototypes -O3 \
-       -static -DLGUEST_GUEST_TOP="$(LGUEST_GUEST_TOP)" -Wl,-T,lguest.lds
+CFLAGS:=-Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include -Wl,-T,lguest.lds
 LDLIBS:=-lz
-
+# Removing this works for some versions of ld.so (eg. Ubuntu Feisty) and
+# not others (eg. FC7).
+LDFLAGS+=-static
 all: lguest.lds lguest
 
 # The linker script on x86 is so complex the only way of creating one