Module Name:    src
Committed By:   nisimura
Date:           Wed Feb 22 12:12:21 UTC 2012

Modified Files:
        src/sys/arch/evbarm/stand/boot2440: Makefile

Log Message:
- adapt DM9000 driver name change.
- move -DLIBSA_PRINTF_WIDTH_SUPPORT to CPPFLAGS variable as SACPPFLAGS
  does not work.
- add a logic to make/remove machine/ and arm/ symlinks.
- remove redundant directives in no use.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/stand/boot2440/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/evbarm/stand/boot2440/Makefile
diff -u src/sys/arch/evbarm/stand/boot2440/Makefile:1.2 src/sys/arch/evbarm/stand/boot2440/Makefile:1.3
--- src/sys/arch/evbarm/stand/boot2440/Makefile:1.2	Tue Jan 31 11:04:17 2012
+++ src/sys/arch/evbarm/stand/boot2440/Makefile	Wed Feb 22 12:12:21 2012
@@ -1,18 +1,19 @@
-#	$NetBSD: Makefile,v 1.2 2012/01/31 11:04:17 nisimura Exp $
+#	$NetBSD: Makefile,v 1.3 2012/02/22 12:12:21 nisimura Exp $
 
 S=		${.CURDIR}/../../../..
+
 PROG=		bootmini2440
-SRCS=		entry.S main.c devopen.c netif.c dev_net.c dm9k.c dev_sdmmc.c
+SRCS=		entry.S main.c devopen.c netif.c dev_net.c dm9000.c dev_sdmmc.c
 SRCS+=		s3csdi.c vers.c
 
 .include <bsd.own.mk>
 
 CLEANFILES+=	vers.c ${PROG}.elf
 CFLAGS+=	-Wall -Wno-main -ffreestanding -march=armv4
-CPPFLAGS+=	-D_STANDALONE -DSUPPORT_DHCP 
+CPPFLAGS+=	-D_STANDALONE -DSUPPORT_DHCP -DLIBSA_PRINTF_WIDTH_SUPPORT
 CPPFLAGS+=	-DDM9000MAC="0x08,0x08,0x11,0x18,0x12,0x27" 
 CPPFLAGS+=	-DDEFAULT_BOOTFILE="ld0a:netbsd;net:"
-CPPFLAGS+=	-nostdinc -I. -I${.CURDIR} -I${.OBJDIR} -I${S} -I${S}/arch
+CPPFLAGS+=	-nostdinc -I. -I${.OBJDIR} -I${S} -I${S}/arch
 DBG=		
 
 LIBCRT0=	# nothing
@@ -28,6 +29,14 @@ BINMODE=	444
 RELOC=		0x30A00000
 ENTRY=		_start
 
+.if !make(obj) && !make(clean) && !make(cleandir)
+.BEGIN:
+	@[ -h machine ] || ln -s ${S}/arch/evbarm/include machine
+	@[ -h arm ] || ln -s ${S}/arch/arm/include arm
+.NOPATH: machine arm
+.endif
+CLEANFILES+= machine arm
+
 ### find out what to use for libkern
 KERN_AS=	library
 .include "${S}/lib/libkern/Makefile.inc"
@@ -41,7 +50,6 @@ LIBZ=		${ZLIB}
 ### find out what to use for libsa
 SA_AS=		library
 SAMISCMAKEFLAGS= SA_USE_CREAD=yes SA_USE_LOADFILE=yes
-SACPPFLAGS=	-DLIBSA_PRINTF_WIDTH_SUPPORT
 .include "${S}/lib/libsa/Makefile.inc"
 LIBSA=		${SALIB}
 
@@ -55,12 +63,4 @@ ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBK
 	    ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
 	${OBJCOPY} -S -O binary ${.TARGET}.elf ${.TARGET}
 
-
-.include <bsd.klinks.mk>
 .include <bsd.prog.mk>
-
-cleandir distclean: .WAIT cleanlibdir
-
-cleanlibdir:
-	-rm -rf lib
-

Reply via email to