hurd-l4 ./configure.ac ./README laden/Makefile....

[Marcus Brinkmann]

CVSROOT:        /cvsroot/hurd
Module name:    hurd-l4
Branch:         
Changes by:     Marcus Brinkmann <address@hidden>       03/09/12 14:45:56

Modified files:
        .              : configure.ac README 
        laden          : Makefile.am 
        physmem        : Makefile.am 
        wortel         : Makefile.am 
Added files:
        libl4          : headers-ia32.m4 headers.m4 

Log message:
        Improve build setup.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/configure.ac.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/README.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/laden/Makefile.am.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/libl4/headers-ia32.m4?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/libl4/headers.m4?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/physmem/Makefile.am.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/wortel/Makefile.am.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: hurd-l4/README
diff -u hurd-l4/README:1.4 hurd-l4/README:1.5
--- hurd-l4/README:1.4  Tue Sep  9 18:13:13 2003
+++ hurd-l4/README      Fri Sep 12 14:45:56 2003
@@ -11,18 +11,18 @@
 How to build
 ------------
 
-It is not yet straightforward.  Something like the below should work:
+Building the code is straight forward:
 
 $ autoreconf -f -i -s
 $ ./configure --enable-maintainer-mode --prefix=/l4
-$ cd libl4
-$ make; make install
-$ cd ..
-$ make CFLAGS=-I/l4/include\ -g\ -O3
+$ make CFLAGS="-g -O3"
+$ make install
 $ mkdir /l4/boot
 $ cp laden/laden /l4/boot
 $ cp wortel/wortel /l4/boot
 $ cp physmem/physmem /l4/boot
+
+Note that use of optimization is mandatory, not optional.
 
 You also need the L4 kernel and sigma0.  sigma0 must be built with a
 different link base than the default value 0x20000, because that
Index: hurd-l4/configure.ac
diff -u hurd-l4/configure.ac:1.6 hurd-l4/configure.ac:1.7
--- hurd-l4/configure.ac:1.6    Tue Sep  9 17:43:12 2003
+++ hurd-l4/configure.ac        Fri Sep 12 14:45:56 2003
@@ -60,6 +60,7 @@
 case $host_cpu in
   i386 | i486 | i586 | i686)
     AM_CONDITIONAL([ARCH_IA32], true)
+    m4_include([libl4/headers-ia32.m4])
     ;;
   *)
     AC_MSG_ERROR([unsupported architecture])
@@ -67,8 +68,9 @@
 esac
 
 # Create links for header file.
-m4_include([libhurd-slab/headers.m4])
+m4_include([libl4/headers.m4])
 m4_include([libhurd-ihash/headers.m4])
+m4_include([libhurd-slab/headers.m4])
 
 if test "x$missing_progs" != "x"; then
   AC_MSG_ERROR([The following programs were not found:$missing_progs])
Index: hurd-l4/laden/Makefile.am
diff -u hurd-l4/laden/Makefile.am:1.4 hurd-l4/laden/Makefile.am:1.5
--- hurd-l4/laden/Makefile.am:1.4       Mon Sep  8 10:42:42 2003
+++ hurd-l4/laden/Makefile.am   Fri Sep 12 14:45:56 2003
@@ -25,7 +25,7 @@
 
 noinst_PROGRAMS = laden
 
-laden_CFLAGS = -I$(srcdir) $(AM_CFLAGS)
+laden_CFLAGS = -I$(srcdir) -I$(top_srcdir)/include $(AM_CFLAGS)
 
 laden_SOURCES =  $(ARCH_SOURCES) string.h string.c             \
        output.h output.c output-none.c                         \
Index: hurd-l4/physmem/Makefile.am
diff -u hurd-l4/physmem/Makefile.am:1.1 hurd-l4/physmem/Makefile.am:1.2
--- hurd-l4/physmem/Makefile.am:1.1     Tue Sep  9 17:43:12 2003
+++ hurd-l4/physmem/Makefile.am Fri Sep 12 14:45:56 2003
@@ -24,7 +24,7 @@
 
 noinst_PROGRAMS = physmem
 
-physmem_CFLAGS = -I$(srcdir) $(AM_CFLAGS)
+physmem_CFLAGS = -I$(srcdir) -I$(top_srcdir)/include $(AM_CFLAGS)
 
 physmem_SOURCES = $(ARCH_SOURCES)                              \
        output.h output.c                                       \
Index: hurd-l4/wortel/Makefile.am
diff -u hurd-l4/wortel/Makefile.am:1.4 hurd-l4/wortel/Makefile.am:1.5
--- hurd-l4/wortel/Makefile.am:1.4      Tue Sep  9 19:43:48 2003
+++ hurd-l4/wortel/Makefile.am  Fri Sep 12 14:45:56 2003
@@ -25,7 +25,7 @@
 
 noinst_PROGRAMS = wortel
 
-wortel_CFLAGS = -I$(srcdir) $(AM_CFLAGS)
+wortel_CFLAGS = -I$(srcdir) -I$(top_srcdir)/include $(AM_CFLAGS)
 
 wortel_SOURCES = $(ARCH_SOURCES) string.h string.c             \
        output.h output.c output-none.c                         \