Deleted Added
sdiff udiff text old ( 220755 ) new ( 228124 )
full compact
bsd.prog.mk (220755) bsd.prog.mk (228124)
1# from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
1# from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
2# $FreeBSD: head/share/mk/bsd.prog.mk 220755 2011-04-17 21:03:23Z dim $
2# $FreeBSD: head/share/mk/bsd.prog.mk 228124 2011-11-29 08:38:47Z fjoe $
3
4.include <bsd.init.mk>
5
6.SUFFIXES: .out .o .c .cc .cpp .cxx .C .m .y .l .ln .s .S .asm
7
8# XXX The use of COPTS in modern makefiles is discouraged.
9.if defined(COPTS)
10CFLAGS+=${COPTS}

--- 44 unchanged lines hidden (view full) ---

55.else
56${PROG}: ${OBJS}
57.endif
58.if defined(PROG_CXX)
59 ${CXX} ${CXXFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
60.else
61 ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
62.endif
3
4.include <bsd.init.mk>
5
6.SUFFIXES: .out .o .c .cc .cpp .cxx .C .m .y .l .ln .s .S .asm
7
8# XXX The use of COPTS in modern makefiles is discouraged.
9.if defined(COPTS)
10CFLAGS+=${COPTS}

--- 44 unchanged lines hidden (view full) ---

55.else
56${PROG}: ${OBJS}
57.endif
58.if defined(PROG_CXX)
59 ${CXX} ${CXXFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
60.else
61 ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
62.endif
63 @[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \
64 (${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS} && \
65 ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS})
63.if !defined(NO_CTF)
64 ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS}
65.endif
66
67.else # !defined(SRCS)
68
69.if !target(${PROG})
70.if defined(PROG_CXX)
71SRCS= ${PROG}.cc
72.else
73SRCS= ${PROG}.c

--- 11 unchanged lines hidden (view full) ---

85.else
86${PROG}: ${OBJS}
87.endif
88.if defined(PROG_CXX)
89 ${CXX} ${CXXFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
90.else
91 ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
92.endif
66
67.else # !defined(SRCS)
68
69.if !target(${PROG})
70.if defined(PROG_CXX)
71SRCS= ${PROG}.cc
72.else
73SRCS= ${PROG}.c

--- 11 unchanged lines hidden (view full) ---

85.else
86${PROG}: ${OBJS}
87.endif
88.if defined(PROG_CXX)
89 ${CXX} ${CXXFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
90.else
91 ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
92.endif
93 @[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \
94 (${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS} && \
95 ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS})
93.if !defined(NO_CTF)
94 ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS}
96.endif
95.endif
96.endif
97
98.endif
99
100.if ${MK_MAN} != "no" && !defined(MAN) && \
101 !defined(MAN1) && !defined(MAN2) && !defined(MAN3) && \
102 !defined(MAN4) && !defined(MAN5) && !defined(MAN6) && \
103 !defined(MAN7) && !defined(MAN8) && !defined(MAN9) && \
104 !defined(MAN1aout)

--- 129 unchanged lines hidden --- 		97
98.endif
99
100.if ${MK_MAN} != "no" && !defined(MAN) && \
101 !defined(MAN1) && !defined(MAN2) && !defined(MAN3) && \
102 !defined(MAN4) && !defined(MAN5) && !defined(MAN6) && \
103 !defined(MAN7) && !defined(MAN8) && !defined(MAN9) && \
104 !defined(MAN1aout)

--- 129 unchanged lines hidden ---