svn commit: r251686 - stable/9/share/mk

[Ed Maste]

Author: emaste
Date: Thu Jun 13 14:38:29 2013
New Revision: 251686
URL: http://svnweb.freebsd.org/changeset/base/251686

Log:
  MFC r244224, r248753
  
    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
  
    Always define and use PROGNAME
  
    This avoids having separate cases in the install rule for PROGNAME set
    and not set.  This is a minor cleanup in advance of further support for
    standalone debug files.

Modified:
  stable/9/share/mk/bsd.lib.mk
  stable/9/share/mk/bsd.prog.mk
Directory Properties:
  stable/9/share/mk/   (props changed)

Modified: stable/9/share/mk/bsd.lib.mk
==============================================================================
--- stable/9/share/mk/bsd.lib.mk	Thu Jun 13 13:05:08 2013	(r251685)
+++ stable/9/share/mk/bsd.lib.mk	Thu Jun 13 14:38:29 2013	(r251686)
@@ -39,9 +39,7 @@ CFLAGS+= ${DEBUG_FLAGS}
 .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
 CTFFLAGS+= -g
 .endif
-.endif
-
-.if !defined(DEBUG_FLAGS)
+.else
 STRIP?=	-s
 .endif
 
@@ -173,10 +171,9 @@ SOLINKOPTS+=	-Wl,--fatal-warnings -Wl,--
 .endif
 
 .if target(beforelinking)
-${SHLIB_NAME}: ${SOBJS} beforelinking
-.else
-${SHLIB_NAME}: ${SOBJS}
+${SHLIB_NAME}: beforelinking
 .endif
+${SHLIB_NAME}: ${SOBJS}
 	@${ECHO} building shared library ${SHLIB_NAME}
 	@rm -f ${.TARGET} ${SHLIB_LINK}
 .if defined(SHLIB_LINK)

Modified: stable/9/share/mk/bsd.prog.mk
==============================================================================
--- stable/9/share/mk/bsd.prog.mk	Thu Jun 13 13:05:08 2013	(r251685)
+++ stable/9/share/mk/bsd.prog.mk	Thu Jun 13 14:38:29 2013	(r251686)
@@ -41,15 +41,15 @@ PROG=	${PROG_CXX}
 .endif
 
 .if defined(PROG)
+PROGNAME?=	${PROG}
 .if defined(SRCS)
 
 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 +76,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 +89,7 @@ ${PROG}: ${OBJS}
 .endif
 .endif
 
-.endif
+.endif # !defined(SRCS)
 
 .if	${MK_MAN} != "no" && !defined(MAN) && \
 	!defined(MAN1) && !defined(MAN2) && !defined(MAN3) && \
@@ -99,7 +98,7 @@ ${PROG}: ${OBJS}
 MAN=	${PROG}.1
 MAN1=	${MAN}
 .endif
-.endif
+.endif # defined(PROG)
 
 all: objwarn ${PROG} ${SCRIPTS}
 .if ${MK_MAN} != "no"
@@ -153,13 +152,8 @@ realinstall: _proginstall
 .ORDER: beforeinstall _proginstall
 _proginstall:
 .if defined(PROG)
-.if defined(PROGNAME)
 	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
-.else
-	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}
-.endif
 .endif
 .endif	# !target(realinstall)