Tue Jun 25 07:18:02 2013 UTC ()
Reorder to avoid !exists
Add a crtbegin.h dependency


(matt)
diff -r1.9 -r1.10 src/lib/csu/common/Makefile.inc
cvs diff -r1.9 -r1.10 src/lib/csu/common/Makefile.inc (expand / switch to unified diff)

--- src/lib/csu/common/Makefile.inc 2013/06/22 02:37:09 1.9
+++ src/lib/csu/common/Makefile.inc 2013/06/25 07:18:02 1.10
@@ -1,50 +1,50 @@ @@ -1,50 +1,50 @@
1# $NetBSD: Makefile.inc,v 1.9 2013/06/22 02:37:09 matt Exp $ 1# $NetBSD: Makefile.inc,v 1.10 2013/06/25 07:18:02 matt Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5COMMON_DIR:= ${.CURDIR}/common 5COMMON_DIR:= ${.CURDIR}/common
6.PATH: ${COMMON_DIR} 6.PATH: ${COMMON_DIR}
7 7
8CPPFLAGS+= -I${NETBSDSRCDIR}/libexec/ld.elf_so -I${COMMON_DIR} -I. 8CPPFLAGS+= -I${NETBSDSRCDIR}/libexec/ld.elf_so -I${COMMON_DIR} -I.
9 9
10OBJS+= crt0.o gcrt0.o crti.o crtn.o 10OBJS+= crt0.o gcrt0.o crti.o crtn.o
11OBJS+= crtbegin.o crtbeginS.o crtend.o 11OBJS+= crtbegin.o crtbeginS.o crtend.o
12 12
13realall: ${OBJS} 13realall: ${OBJS}
14 14
15.if !exists(${ARCHDIR}/crtbegin.S) 15.if exists(${ARCHDIR}/crtbegin.S)
16crtbegin.o: crtbegin.c 
17 ${_MKTARGET_COMPILE} 
18 ${COMPILE.c} ${COMMON_DIR}/crtbegin.c -o ${.TARGET}.o 
19.else 
20crtbegin.o: crtbegin.S 16crtbegin.o: crtbegin.S
21 ${_MKTARGET_COMPILE} 17 ${_MKTARGET_COMPILE}
22 ${COMPILE.S} ${ARCHDIR}/crtbegin.S -o ${.TARGET}.o 18 ${COMPILE.S} ${ARCHDIR}/crtbegin.S -o ${.TARGET}.o
 19.else
 20crtbegin.o: crtbegin.c crtbegin.h
 21 ${_MKTARGET_COMPILE}
 22 ${COMPILE.c} ${COMMON_DIR}/crtbegin.c -o ${.TARGET}.o
23.endif 23.endif
24 ${LD} -x -r -o ${.TARGET} ${.TARGET}.o 24 ${LD} -x -r -o ${.TARGET} ${.TARGET}.o
25 rm -f ${.TARGET}.o 25 rm -f ${.TARGET}.o
26.if ${MKSTRIPIDENT} != "no" 26.if ${MKSTRIPIDENT} != "no"
27 ${OBJCOPY} -R .ident ${.TARGET} 27 ${OBJCOPY} -R .ident ${.TARGET}
28.endif 28.endif
29 29
30.if !exists(${ARCHDIR}/crtbegin.S) 30.if exists(${ARCHDIR}/crtbegin.S)
31crtbeginS.o: crtbegin.c 
32 ${_MKTARGET_COMPILE} 
33 ${COMPILE.c} -DPIC -DSHARED ${COMMON_DIR}/crtbegin.c -o ${.TARGET}.o 
34.else 
35crtbeginS.o: crtbegin.S 31crtbeginS.o: crtbegin.S
36 ${_MKTARGET_COMPILE} 32 ${_MKTARGET_COMPILE}
37 ${COMPILE.S} -DPIC -DSHARED ${ARCHDIR}/crtbegin.S -o ${.TARGET}.o 33 ${COMPILE.S} -DPIC -DSHARED ${ARCHDIR}/crtbegin.S -o ${.TARGET}.o
 34.else
 35crtbeginS.o: crtbegin.c crtbegin.h
 36 ${_MKTARGET_COMPILE}
 37 ${COMPILE.c} -DPIC -DSHARED ${COMMON_DIR}/crtbegin.c -o ${.TARGET}.o
38.endif 38.endif
39 ${LD} -x -r -o ${.TARGET} ${.TARGET}.o 39 ${LD} -x -r -o ${.TARGET} ${.TARGET}.o
40 rm -f ${.TARGET}.o 40 rm -f ${.TARGET}.o
41.if ${MKSTRIPIDENT} != "no" 41.if ${MKSTRIPIDENT} != "no"
42 ${OBJCOPY} -R .ident ${.TARGET} 42 ${OBJCOPY} -R .ident ${.TARGET}
43.endif 43.endif
44 44
45crtend.o: crtend.S 45crtend.o: crtend.S
46 ${_MKTARGET_COMPILE} 46 ${_MKTARGET_COMPILE}
47 ${COMPILE.S} ${ARCHDIR}/crtend.S -o ${.TARGET}.o 47 ${COMPILE.S} ${ARCHDIR}/crtend.S -o ${.TARGET}.o
48 ${LD} -x -r -o ${.TARGET} ${.TARGET}.o 48 ${LD} -x -r -o ${.TARGET} ${.TARGET}.o
49 rm -f ${.TARGET}.o 49 rm -f ${.TARGET}.o
50.if ${MKSTRIPIDENT} != "no" 50.if ${MKSTRIPIDENT} != "no"