* doc/Makefile.am (kernel_LDFLAGS): Add -m32.

	(kernel_CFLAGS): Changed from this ...
	(kernel_CPPFLAGS): ... to this.

diff --git a/ChangeLog b/ChangeLog
index 9f14b7f65e161bde49fe875211f8346f8b91c460..4f976eec70798b63bbbdd63c73bd8e16aa4e9bf7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * doc/Makefile.am (kernel_LDFLAGS): Add -m32.
+       (kernel_CFLAGS): Changed from this ...
+       (kernel_CPPFLAGS): ... to this.
+
 2010-10-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * doc/multiboot.h (multiboot_apm_info): Use multiboot and not GRUB

diff --git a/doc/Makefile.am b/doc/Makefile.am
index dd65301de7a8c0750b4a847965aca1aca9d662e0..5ca878f540653f48720ba86b581e5ad84c14078a 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -10,9 +10,9 @@ pkginclude_HEADERS = multiboot.h
 if BUILD_EXAMPLE_KERNEL
 noinst_PROGRAMS = kernel
 kernel_SOURCES = $(EXAMPLES)
-kernel_CFLAGS = -m32 -nostdlib -fno-builtin -nostdinc -O -g -Wall \
+kernel_CPPFLAGS = -m32 -nostdlib -fno-builtin -nostdinc -O -g -Wall \
        -imacros $(top_builddir)/config.h
-kernel_LDFLAGS = -nostdlib -Wl,-N -Wl,-Ttext -Wl,100000 -Wl,--build-id=none
+kernel_LDFLAGS = -m32 -nostdlib -Wl,-N -Wl,-Ttext -Wl,100000 -Wl,--build-id=none
 
 boot.o: multiboot.h
 endif