Update makefiles:

centralize obj/noobj conditional in Makefile.inc
	use DPADD
	don't compile profiling library
	install rcsfreeze correctly
After this commit, the freebsd and netbsd rcs distribution will be in sync.
This commit is contained in:
conklin 1993-07-09 16:15:13 +00:00
parent bddc6a954b
commit 8ae49835b1
12 changed files with 53 additions and 83 deletions

View File

@ -1,3 +1,7 @@
# @(#)Makefile.inc 5.1 (Berkeley) 5/11/90
# Location of librcs
BINDIR?= /usr/bin
.if exists(${.CURDIR}/../lib/obj)
LIBRCS= ${.CURDIR}/../lib/obj/librcs.a
.else
LIBRCS= ${.CURDIR}/../lib/librcs.a
.endif

View File

@ -1,12 +1,8 @@
PROG= ci
PROG= ci
SRCS= ci.c
.if exists(${.CURDIR}/../lib/obj)
LDADD= -L${.CURDIR}/../lib/obj -lrcs
.else
LDADD= -L${.CURDIR}/../lib/ -lrcs
.endif
CFLAGS+= -I${.CURDIR}/../lib
LDADD= ${LIBRCS}
DPADD= ${LIBRCS}
.include "../../Makefile.inc"
.include <bsd.prog.mk>

View File

@ -1,12 +1,8 @@
PROG= co
PROG= co
SRCS= co.c
.if exists(${.CURDIR}/../lib/obj)
LDADD= -L${.CURDIR}/../lib/obj -lrcs
.else
LDADD= -L${.CURDIR}/../lib/ -lrcs
.endif
CFLAGS+= -I${.CURDIR}/../lib
LDADD= ${LIBRCS}
DPADD= ${LIBRCS}
.include "../../Makefile.inc"
.include <bsd.prog.mk>

View File

@ -1,12 +1,8 @@
PROG= ident
PROG= ident
SRCS= ident.c
.if exists(${.CURDIR}/../lib/obj)
LDADD= -L${.CURDIR}/../lib/obj -lrcs
.else
LDADD= -L${.CURDIR}/../lib/ -lrcs
.endif
CFLAGS+= -I${.CURDIR}/../lib
LDADD= ${LIBRCS}
DPADD= ${LIBRCS}
.include "../../Makefile.inc"
.include <bsd.prog.mk>

View File

@ -7,7 +7,8 @@ SRCS = maketime.c partime.c rcsedit.c rcsfcmp.c rcsfnms.c rcsgen.c \
rcskeep.c rcskeys.c rcslex.c rcsmap.c rcsrev.c rcssyn.c rcsutil.c \
merger.c
NOPROFILE=noprofile
install:
@echo -n
.include <bsd.lib.mk>

View File

@ -1,12 +1,8 @@
PROG= merge
PROG= merge
SRCS= merge.c
.if exists(${.CURDIR}/../lib/obj)
LDADD= -L${.CURDIR}/../lib/obj -lrcs
.else
LDADD= -L${.CURDIR}/../lib/ -lrcs
.endif
CFLAGS+= -I${.CURDIR}/../lib
LDADD= ${LIBRCS}
DPADD= ${LIBRCS}
.include "../../Makefile.inc"
.include <bsd.prog.mk>

View File

@ -1,15 +1,11 @@
PROG= rcs
PROG= rcs
SRCS= rcs.c
.if exists(${.CURDIR}/../lib/obj)
LDADD= -L${.CURDIR}/../lib/obj -lrcs
.else
LDADD= -L${.CURDIR}/../lib/ -lrcs
.endif
CFLAGS+= -I${.CURDIR}/../lib
LDADD= ${LIBRCS}
DPADD= ${LIBRCS}
MAN1= rcs.1 rcsintro.1
MAN5= rcsfile.5
MAN1= rcs.0 rcsintro.0
MAN5= rcsfile.0
.include "../../Makefile.inc"
.include <bsd.prog.mk>

View File

@ -1,12 +1,8 @@
PROG= rcsclean
PROG= rcsclean
SRCS= rcsclean.c
.if exists(${.CURDIR}/../lib/obj)
LDADD= -L${.CURDIR}/../lib/obj -lrcs
.else
LDADD= -L${.CURDIR}/../lib/ -lrcs
.endif
CFLAGS+= -I${.CURDIR}/../lib
LDADD= ${LIBRCS}
DPADD= ${LIBRCS}
.include "../../Makefile.inc"
.include <bsd.prog.mk>

View File

@ -1,12 +1,8 @@
PROG= rcsdiff
PROG= rcsdiff
SRCS= rcsdiff.c
.if exists(${.CURDIR}/../lib/obj)
LDADD= -L${.CURDIR}/../lib/obj -lrcs
.else
LDADD= -L${.CURDIR}/../lib/ -lrcs
.endif
CFLAGS+= -I${.CURDIR}/../lib
LDADD= ${LIBRCS}
DPADD= ${LIBRCS}
.include "../../Makefile.inc"
.include <bsd.prog.mk>

View File

@ -1,7 +1,8 @@
# Do nothing for the following
obj clean cleandir depend rcsfreeze all:
@echo -n
MAN1= rcsfreeze.0
install:
install -c -o bin -g bin -m 555 rcsfreeze.sh /usr/bin/rcsfreeze
install -c -o bin -g bin -m 444 rcsfreeze.1 /usr/share/man/man1
afterinstall:
install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/rcsfreeze.sh ${DESTDIR}${BINDIR}/rcsfreeze
.include "../../Makefile.inc"
.include <bsd.prog.mk>

View File

@ -1,12 +1,8 @@
PROG= rcsmerge
PROG= rcsmerge
SRCS= rcsmerge.c
.if exists(${.CURDIR}/../lib/obj)
LDADD= -L${.CURDIR}/../lib/obj -lrcs
.else
LDADD= -L${.CURDIR}/../lib/ -lrcs
.endif
CFLAGS+= -I${.CURDIR}/../lib
LDADD= ${LIBRCS}
DPADD= ${LIBRCS}
.include "../../Makefile.inc"
.include <bsd.prog.mk>

View File

@ -1,12 +1,8 @@
PROG= rlog
PROG= rlog
SRCS= rlog.c
.if exists(${.CURDIR}/../lib/obj)
LDADD= -L${.CURDIR}/../lib/obj -lrcs
.else
LDADD= -L${.CURDIR}/../lib/ -lrcs
.endif
CFLAGS+= -I${.CURDIR}/../lib
LDADD= ${LIBRCS}
DPADD= ${LIBRCS}
.include "../../Makefile.inc"
.include <bsd.prog.mk>