head	1.5;
access;
symbols
	RELENG_8_4:1.5.0.86
	RELENG_9_1_0_RELEASE:1.5
	RELENG_9_1:1.5.0.84
	RELENG_9_1_BP:1.5
	RELENG_8_3_0_RELEASE:1.5
	RELENG_8_3:1.5.0.82
	RELENG_8_3_BP:1.5
	RELENG_9_0_0_RELEASE:1.5
	RELENG_9_0:1.5.0.80
	RELENG_9_0_BP:1.5
	RELENG_9:1.5.0.78
	RELENG_9_BP:1.5
	RELENG_7_4_0_RELEASE:1.5
	RELENG_8_2_0_RELEASE:1.5
	RELENG_7_4:1.5.0.76
	RELENG_7_4_BP:1.5
	RELENG_8_2:1.5.0.74
	RELENG_8_2_BP:1.5
	RELENG_8_1_0_RELEASE:1.5
	RELENG_8_1:1.5.0.72
	RELENG_8_1_BP:1.5
	RELENG_7_3_0_RELEASE:1.5
	RELENG_7_3:1.5.0.70
	RELENG_7_3_BP:1.5
	RELENG_8_0_0_RELEASE:1.5
	RELENG_8_0:1.5.0.68
	RELENG_8_0_BP:1.5
	RELENG_8:1.5.0.66
	RELENG_8_BP:1.5
	RELENG_7_2_0_RELEASE:1.5
	RELENG_7_2:1.5.0.64
	RELENG_7_2_BP:1.5
	RELENG_7_1_0_RELEASE:1.5
	RELENG_6_4_0_RELEASE:1.5
	RELENG_7_1:1.5.0.62
	RELENG_7_1_BP:1.5
	RELENG_6_4:1.5.0.60
	RELENG_6_4_BP:1.5
	RELENG_7_0_0_RELEASE:1.5
	RELENG_6_3_0_RELEASE:1.5
	RELENG_7_0:1.5.0.58
	RELENG_7_0_BP:1.5
	RELENG_6_3:1.5.0.56
	RELENG_6_3_BP:1.5
	RELENG_7:1.5.0.54
	RELENG_7_BP:1.5
	RELENG_6_2_0_RELEASE:1.5
	RELENG_6_2:1.5.0.52
	RELENG_6_2_BP:1.5
	RELENG_5_5_0_RELEASE:1.5
	RELENG_5_5:1.5.0.50
	RELENG_5_5_BP:1.5
	RELENG_6_1_0_RELEASE:1.5
	RELENG_6_1:1.5.0.48
	RELENG_6_1_BP:1.5
	RELENG_6_0_0_RELEASE:1.5
	RELENG_6_0:1.5.0.46
	RELENG_6_0_BP:1.5
	RELENG_6:1.5.0.44
	RELENG_6_BP:1.5
	RELENG_5_4_0_RELEASE:1.5
	RELENG_5_4:1.5.0.42
	RELENG_5_4_BP:1.5
	RELENG_4_11_0_RELEASE:1.5
	RELENG_4_11:1.5.0.40
	RELENG_4_11_BP:1.5
	RELENG_5_3_0_RELEASE:1.5
	RELENG_5_3:1.5.0.38
	RELENG_5_3_BP:1.5
	RELENG_5:1.5.0.36
	RELENG_5_BP:1.5
	RELENG_4_10_0_RELEASE:1.5
	RELENG_4_10:1.5.0.34
	RELENG_4_10_BP:1.5
	RELENG_5_2_1_RELEASE:1.5
	RELENG_5_2_0_RELEASE:1.5
	RELENG_5_2:1.5.0.32
	RELENG_5_2_BP:1.5
	RELENG_4_9_0_RELEASE:1.5
	RELENG_4_9:1.5.0.30
	RELENG_4_9_BP:1.5
	RELENG_5_1_0_RELEASE:1.5
	RELENG_5_1:1.5.0.28
	RELENG_5_1_BP:1.5
	RELENG_4_8_0_RELEASE:1.5
	RELENG_4_8:1.5.0.26
	RELENG_4_8_BP:1.5
	RELENG_5_0_0_RELEASE:1.5
	RELENG_5_0:1.5.0.24
	RELENG_5_0_BP:1.5
	RELENG_4_7_0_RELEASE:1.5
	RELENG_4_7:1.5.0.22
	RELENG_4_7_BP:1.5
	RELENG_4_6_2_RELEASE:1.5
	RELENG_4_6_1_RELEASE:1.5
	RELENG_4_6_0_RELEASE:1.5
	RELENG_4_6:1.5.0.20
	RELENG_4_6_BP:1.5
	RELENG_4_5_0_RELEASE:1.5
	RELENG_4_5:1.5.0.18
	RELENG_4_5_BP:1.5
	RELENG_4_4_0_RELEASE:1.5
	RELENG_4_4:1.5.0.16
	RELENG_4_4_BP:1.5
	RELENG_4_3_0_RELEASE:1.5
	RELENG_4_3:1.5.0.14
	RELENG_4_3_BP:1.5
	RELENG_4_2_0_RELEASE:1.5
	RELENG_4_1_1_RELEASE:1.5
	PRE_SMPNG:1.5
	RELENG_4_1_0_RELEASE:1.5
	RELENG_3_5_0_RELEASE:1.5
	RELENG_4_0_0_RELEASE:1.5
	RELENG_4:1.5.0.12
	RELENG_4_BP:1.5
	RELENG_3_4_0_RELEASE:1.5
	RELENG_3_3_0_RELEASE:1.5
	RELENG_3_2_PAO:1.5.0.10
	RELENG_3_2_PAO_BP:1.5
	RELENG_3_2_0_RELEASE:1.5
	RELENG_3_1_0_RELEASE:1.5
	RELENG_3:1.5.0.8
	RELENG_3_BP:1.5
	RELENG_2_2_8_RELEASE:1.5
	RELENG_3_0_0_RELEASE:1.5
	RELENG_2_2_7_RELEASE:1.5
	RELENG_2_2_6_RELEASE:1.5
	RELENG_2_2_5_RELEASE:1.5
	RELENG_2_2_2_RELEASE:1.5
	RELENG_2_2_1_RELEASE:1.5
	RELENG_2_2_0_RELEASE:1.5
	RELENG_2_1_7_RELEASE:1.5
	RELENG_2_1_6_1_RELEASE:1.5
	RELENG_2_1_6_RELEASE:1.5
	RELENG_2_2:1.5.0.6
	RELENG_2_2_BP:1.5
	RELENG_2_1_5_RELEASE:1.5
	RELENG_2_1_0_RELEASE:1.5
	rcs_5_7:1.1.1.2
	GNU:1.1.1
	chkpt_before_rcs_5_7:1.5
	RELENG_2_1_0:1.5.0.4
	RELENG_2_1_0_BP:1.5
	RELENG_2_0_5_RELEASE:1.5
	RELENG_2_0_5:1.5.0.2
	RELENG_2_0_5_BP:1.5
	RELENG_2_0_5_ALPHA:1.4
	RELEASE_2_0:1.4
	BETA_2_0:1.4
	ALPHA_2_0:1.4.0.4
	MOVED_NEWCVS:1.4
	FINAL_1_1_5:1.4
	ALPHA_1_1_5:1.4
	FINAL_1_1:1.4
	GAMMA_1_1:1.4
	BETA_1_1:1.4.0.2
	BP_BETA_1_1:1.4
	FINAL_1_0:1.4
	EPSILON_1_0:1.4
	GAMMA_1_0:1.4
	BETA_1_0:1.4
	ALPHA_1_0:1.4
	gnu:1.1.1.1;
locks; strict;
comment	@# @;


1.5
date	95.05.30.05.04.29;	author rgrimes;	state Exp;
branches
	1.5.86.1;
next	1.4;

1.4
date	93.07.09.16.15.08;	author conklin;	state Exp;
branches;
next	1.3;

1.3
date	93.07.06.19.46.01;	author nate;	state Exp;
branches;
next	1.2;

1.2
date	93.06.25.18.51.03;	author nate;	state Exp;
branches;
next	1.1;

1.1
date	93.06.18.04.22.15;	author jkh;	state Exp;
branches
	1.1.1.1;
next	;

1.5.86.1
date	95.05.30.05.04.29;	author svnexp;	state dead;
branches;
next	1.5.86.2;

1.5.86.2
date	2013.03.28.13.02.53;	author svnexp;	state Exp;
branches;
next	;

1.1.1.1
date	93.06.18.04.22.16;	author jkh;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	95.10.28.21.07.28;	author peter;	state Exp;
branches;
next	;


desc
@@


1.5
log
@Remove trailing whitespace.
@
text
@PROG=	rcsmerge
SRCS=	rcsmerge.c
CFLAGS+= -I${.CURDIR}/../lib
LDADD=	${LIBRCS}
DPADD=	${LIBRCS}

.include "../../Makefile.inc"
.include <bsd.prog.mk>
@


1.5.86.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:02:53 +0000
@
text
@d1 8
@


1.5.86.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 8
PROG=	rcsmerge
SRCS=	rcsmerge.c
CFLAGS+= -I${.CURDIR}/../lib
LDADD=	${LIBRCS}
DPADD=	${LIBRCS}

.include "../../Makefile.inc"
.include <bsd.prog.mk>
@


1.4
log
@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.
@
text
@d2 1
a2 1
SRCS=	rcsmerge.c 
@


1.3
log
@Really cleaned up obj/noobj this time (same as I did with CVS)
@
text
@d1 1
a1 1
PROG= rcsmerge
a2 7

.if exists(${.CURDIR}/../lib/obj)
LDADD=  -L${.CURDIR}/../lib/obj -lrcs
.else
LDADD=  -L${.CURDIR}/../lib/ -lrcs
.endif

d4 2
d7 1
@


1.2
log
@Fixed cvs to work with/without object directories and added missing rcslean
directory to top level makefile.
@
text
@d2 7
a9 2
SRCS=	rcsmerge.c 
LDADD=	-L${.CURDIR}/../lib/${.CURDIR} -lrcs
@


1.1
log
@Initial revision
@
text
@d4 1
a4 1
LDADD=	-L${.CURDIR}/../lib/obj -lrcs
@


1.1.1.1
log
@Updated GNU utilities
@
text
@@


1.1.1.2
log
@Import rcs-5.7, required for full support of cvs-1.6.

This is going to be pretty messy....  Although the vendor import was correct,
both the vendor and release tags are the same "gnu"... :-/
Getting cvs to choose the correct one might be rather interesting...
@
text
@d1 4
a4 2
PROG=	rcsmerge
SRCS=	rcsmerge.c
a5 2
LDADD=	${LIBRCS}
DPADD=	${LIBRCS}
a6 1
.include "../../Makefile.inc"
@
