diff options
| author | emaste <emaste@FreeBSD.org> | 2012-12-14 18:30:01 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2012-12-14 18:30:01 +0000 |
| commit | 83744c884cc3ce9e58e162c15a7575e303696015 (patch) | |
| tree | f6edeaf6a3fae861361ad351f6d3ecd7997a9221 /share/mk/bsd.prog.mk | |
| parent | 1d3ec906ca23ea5f5ff60e8ebe9b3bcc4f9033d2 (diff) | |
| download | FreeBSD-src-83744c884cc3ce9e58e162c15a7575e303696015.zip FreeBSD-src-83744c884cc3ce9e58e162c15a7575e303696015.tar.gz | |
Minor refactoring prior to .symbols file changes
- Combine .if x and .if !x using .else
- Separate out beforelinking dependency
- Add comments to clarify .if nesting
Sponsored by: ADARA Networks
Diffstat (limited to 'share/mk/bsd.prog.mk')
| -rw-r--r-- | share/mk/bsd.prog.mk | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 3c306eb..950d381 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -46,10 +46,9 @@ PROG= ${PROG_CXX} OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .if target(beforelinking) -${PROG}: ${OBJS} beforelinking -.else -${PROG}: ${OBJS} +${PROG}: beforelinking .endif +${PROG}: ${OBJS} .if defined(PROG_CXX) ${CXX} ${CXXFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD} .else @@ -76,10 +75,9 @@ SRCS= ${PROG}.c OBJS= ${PROG}.o .if target(beforelinking) -${PROG}: ${OBJS} beforelinking -.else -${PROG}: ${OBJS} +${PROG}: beforelinking .endif +${PROG}: ${OBJS} .if defined(PROG_CXX) ${CXX} ${CXXFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD} .else @@ -90,7 +88,7 @@ ${PROG}: ${OBJS} .endif .endif -.endif +.endif # !defined(SRCS) .if ${MK_MAN} != "no" && !defined(MAN) && \ !defined(MAN1) && !defined(MAN2) && !defined(MAN3) && \ @@ -100,7 +98,7 @@ ${PROG}: ${OBJS} MAN= ${PROG}.1 MAN1= ${MAN} .endif -.endif +.endif # defined(PROG) all: objwarn ${PROG} ${SCRIPTS} .if ${MK_MAN} != "no" |
