hurd-l4/physmem Makefile.am malloc.c malloc-wrap.c

[Marcus Brinkmann]

CVSROOT:        /cvsroot/hurd
Module name:    hurd-l4
Branch:         
Changes by:     Marcus Brinkmann <address@hidden>       03/09/22 09:32:15

Modified files:
        physmem        : Makefile.am 
Added files:
        physmem        : malloc.c malloc-wrap.c 

Log message:
        2003-09-22  Marcus Brinkmann  <address@hidden>
        
        * Makefile.am (AM_CPPFLAGS, physmem_CFLAGS): Removed.
        (physmem_CPPFLAGS): New variable.
        (physmem_SOURCES): Add malloc-wrap.c.
        (EXTRA_physmem_SOURCES): New variable.
        * malloc.c, malloc-wrap.c: New files.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/physmem/malloc.c?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/physmem/malloc-wrap.c?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/physmem/Makefile.am.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: hurd-l4/physmem/Makefile.am
diff -u hurd-l4/physmem/Makefile.am:1.7 hurd-l4/physmem/Makefile.am:1.8
--- hurd-l4/physmem/Makefile.am:1.7     Sun Sep 21 14:12:47 2003
+++ hurd-l4/physmem/Makefile.am Mon Sep 22 09:32:14 2003
@@ -18,22 +18,24 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
-AM_CPPFLAGS = -I$(top_builddir)/include
-
 if ARCH_IA32
   ARCH_SOURCES = ia32-crt0.S ia32-cmain.c
 endif
 
 noinst_PROGRAMS = physmem
 
-physmem_CFLAGS = -I$(srcdir) -I$(top_srcdir)/include $(AM_CFLAGS)
+physmem_CPPFLAGS = -I$(top_builddir)/include                   \
+       -I$(top_builddir)/libc-parts $(AM_CPPFLAGS)
 
 physmem_SOURCES = $(ARCH_SOURCES)                              \
        output.h output.c                                       \
-       zalloc.h zalloc.c                                       \
+       zalloc.h zalloc.c malloc-wrap.c                         \
        physmem.h physmem.c
 
-/* FIXME: Make linkbase configurable.  */
+# Doug Lea's malloc is included by malloc-wrap.c.
+EXTRA_physmem_SOURCES = mallo.c
+
+# FIXME: Make linkbase configurable.
 physmem_LDFLAGS = -u_start -e_start -N -nostdlib -Ttext=0x35000
 
 physmem_LDADD = -lgcc ../libc-parts/libc-parts.a