Module Name:    src
Committed By:   matt
Date:           Sun Mar  2 03:42:50 UTC 2014

Modified Files:
        src/usr.bin/crunch/crunchide: Makefile

Log Message:
Use OBJECT_FMTS from <bsd.own.mk>


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/crunch/crunchide/Makefile

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

Modified files:

Index: src/usr.bin/crunch/crunchide/Makefile
diff -u src/usr.bin/crunch/crunchide/Makefile:1.18 src/usr.bin/crunch/crunchide/Makefile:1.19
--- src/usr.bin/crunch/crunchide/Makefile:1.18	Sun Jan 26 18:24:29 2014
+++ src/usr.bin/crunch/crunchide/Makefile	Sun Mar  2 03:42:50 2014
@@ -1,36 +1,13 @@
-#	$NetBSD: Makefile,v 1.18 2014/01/26 18:24:29 matt Exp $
+#	$NetBSD: Makefile,v 1.19 2014/03/02 03:42:50 matt Exp $
 
 .include <bsd.own.mk>
 
 PROG=   crunchide
-SRCS=	crunchide.c exec_aout.c exec_coff.c exec_ecoff.c exec_elf32.c \
-	exec_elf64.c
+SRCS=	crunchide.c
 
-.if	${MACHINE_ARCH} == "alpha"
-CPPFLAGS+=-DNLIST_ELF64 -DNLIST_ECOFF
-.elif	${MACHINE_ARCH} == "mips" || \
-	${MACHINE_ARCH} == "mipsel" || \
-	${MACHINE_ARCH} == "mipseb" || \
-	${MACHINE_ARCH} == "powerpc"
-CPPFLAGS+=-DNLIST_ELF32
-.elif	${MACHINE_ARCH} == "sh3eb" || ${MACHINE_ARCH} == "sh3el"
-CPPFLAGS+=-DNLIST_ELF32 -DNLIST_COFF
-.elif	${MACHINE_ARCH} == "mips64el" || \
-	${MACHINE_ARCH} == "mips64eb" || \
-	${MACHINE_ARCH} == "powerpc64" || \
-	${MACHINE_ARCH} == "x86_64"
-CPPFLAGS+=-DNLIST_ELF32 -DNLIST_ELF64
-.elif	${MACHINE_ARCH} == "sparc64"
-CPPFLAGS+=-DNLIST_AOUT -DNLIST_ELF32 -DNLIST_ELF64
-.elif	${MACHINE_CPU} == "arm" || \
-	${MACHINE_ARCH} == "coldfire" || \
-	${MACHINE_ARCH} == "i386" || \
-	${MACHINE_ARCH} == "m68k" || \
-	${MACHINE_ARCH} == "m68000" || \
-	${MACHINE_ARCH} == "sparc"
-CPPFLAGS+=-DNLIST_AOUT -DNLIST_ELF32
-.else
-CPPFLAGS+=-DNLIST_AOUT
-.endif
+.for ofmt in ${OBJECT_FMTS}
+CPPFLAGS+=	-DNLIST_${ofmt:tu}
+SRCS+=		exec_${ofmt}.c
+.endfor
 
 .include <bsd.prog.mk>

Reply via email to