Really cleaned up obj/noobj this time (same as I did with CVS)

9 files changed, 63 insertions, 18 deletions

diff --git a/gnu/usr.bin/rcs/ci/Makefile b/gnu/usr.bin/rcs/ci/Makefile
index f93376a..6962c55 100644
--- a/gnu/usr.bin/rcs/ci/Makefile
+++ b/gnu/usr.bin/rcs/ci/Makefile
@@ -1,7 +1,12 @@
 PROG= ci
-
 SRCS=	ci.c 
-LDADD=	-L${.CURDIR}/../lib/${.CURDIR} -lrcs
+
+.if exists(${.CURDIR}/../lib/obj)
+LDADD=  -L${.CURDIR}/../lib/obj -lrcs
+.else
+LDADD=  -L${.CURDIR}/../lib/ -lrcs
+.endif
+
 CFLAGS+= -I${.CURDIR}/../lib
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/rcs/co/Makefile b/gnu/usr.bin/rcs/co/Makefile
index 23eb948..6896d6f 100644
--- a/gnu/usr.bin/rcs/co/Makefile
+++ b/gnu/usr.bin/rcs/co/Makefile
@@ -1,7 +1,12 @@
 PROG= co
-
 SRCS=	co.c 
-LDADD=	-L${.CURDIR}/../lib/${.CURDIR} -lrcs
+.if exists(${.CURDIR}/../lib/obj)
+
+LDADD=  -L${.CURDIR}/../lib/obj -lrcs
+.else
+LDADD=  -L${.CURDIR}/../lib/ -lrcs
+.endif
+
 CFLAGS+= -I${.CURDIR}/../lib
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/rcs/ident/Makefile b/gnu/usr.bin/rcs/ident/Makefile
index 77850a2..281abde 100644
--- a/gnu/usr.bin/rcs/ident/Makefile
+++ b/gnu/usr.bin/rcs/ident/Makefile
@@ -1,7 +1,12 @@
 PROG= ident
-
 SRCS=	ident.c 
-LDADD=	-L${.CURDIR}/../lib/${.CURDIR} -lrcs
+
+.if exists(${.CURDIR}/../lib/obj)
+LDADD=  -L${.CURDIR}/../lib/obj -lrcs
+.else
+LDADD=  -L${.CURDIR}/../lib/ -lrcs
+.endif
+
 CFLAGS+= -I${.CURDIR}/../lib
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/rcs/merge/Makefile b/gnu/usr.bin/rcs/merge/Makefile
index edb2c20..57ca047 100644
--- a/gnu/usr.bin/rcs/merge/Makefile
+++ b/gnu/usr.bin/rcs/merge/Makefile
@@ -1,7 +1,12 @@
 PROG= merge
-
 SRCS=	merge.c
-LDADD=	-L${.CURDIR}/../lib/${.CURDIR} -lrcs
+
+.if exists(${.CURDIR}/../lib/obj)
+LDADD=  -L${.CURDIR}/../lib/obj -lrcs
+.else
+LDADD=  -L${.CURDIR}/../lib/ -lrcs
+.endif
+
 CFLAGS+= -I${.CURDIR}/../lib
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/rcs/rcs/Makefile b/gnu/usr.bin/rcs/rcs/Makefile
index 802575d..363d7e3 100644
--- a/gnu/usr.bin/rcs/rcs/Makefile
+++ b/gnu/usr.bin/rcs/rcs/Makefile
@@ -1,7 +1,12 @@
 PROG= rcs
-
 SRCS=	rcs.c 
-LDADD=	-L${.CURDIR}/../lib/${.CURDIR} -lrcs
+
+.if exists(${.CURDIR}/../lib/obj)
+LDADD=  -L${.CURDIR}/../lib/obj -lrcs
+.else
+LDADD=  -L${.CURDIR}/../lib/ -lrcs
+.endif
+
 CFLAGS+= -I${.CURDIR}/../lib
 
 MAN1=	rcs.1 rcsintro.1
diff --git a/gnu/usr.bin/rcs/rcsclean/Makefile b/gnu/usr.bin/rcs/rcsclean/Makefile
index fa9ca81..0cd737d 100644
--- a/gnu/usr.bin/rcs/rcsclean/Makefile
+++ b/gnu/usr.bin/rcs/rcsclean/Makefile
@@ -1,7 +1,12 @@
 PROG= rcsclean
-
 SRCS=	rcsclean.c 
-LDADD=	-L${.CURDIR}/../lib/${.CURDIR} -lrcs
+
+.if exists(${.CURDIR}/../lib/obj)
+LDADD=  -L${.CURDIR}/../lib/obj -lrcs
+.else
+LDADD=  -L${.CURDIR}/../lib/ -lrcs
+.endif
+
 CFLAGS+= -I${.CURDIR}/../lib
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/rcs/rcsdiff/Makefile b/gnu/usr.bin/rcs/rcsdiff/Makefile
index f1baa6f..6f7d92f 100644
--- a/gnu/usr.bin/rcs/rcsdiff/Makefile
+++ b/gnu/usr.bin/rcs/rcsdiff/Makefile
@@ -1,7 +1,12 @@
 PROG= rcsdiff
-
 SRCS=	rcsdiff.c 
-LDADD=	-L${.CURDIR}/../lib/${.CURDIR} -lrcs
+
+.if exists(${.CURDIR}/../lib/obj)
+LDADD=  -L${.CURDIR}/../lib/obj -lrcs
+.else
+LDADD=  -L${.CURDIR}/../lib/ -lrcs
+.endif
+
 CFLAGS+= -I${.CURDIR}/../lib
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/rcs/rcsmerge/Makefile b/gnu/usr.bin/rcs/rcsmerge/Makefile
index 0c6f177..c927b46 100644
--- a/gnu/usr.bin/rcs/rcsmerge/Makefile
+++ b/gnu/usr.bin/rcs/rcsmerge/Makefile
@@ -1,7 +1,12 @@
 PROG= rcsmerge
-
 SRCS=	rcsmerge.c 
-LDADD=	-L${.CURDIR}/../lib/${.CURDIR} -lrcs
+
+.if exists(${.CURDIR}/../lib/obj)
+LDADD=  -L${.CURDIR}/../lib/obj -lrcs
+.else
+LDADD=  -L${.CURDIR}/../lib/ -lrcs
+.endif
+
 CFLAGS+= -I${.CURDIR}/../lib
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/rcs/rlog/Makefile b/gnu/usr.bin/rcs/rlog/Makefile
index 3d1fc2c..96fe01e 100644
--- a/gnu/usr.bin/rcs/rlog/Makefile
+++ b/gnu/usr.bin/rcs/rlog/Makefile
@@ -1,7 +1,12 @@
 PROG= rlog
-
 SRCS=	rlog.c 
-LDADD=	-L${.CURDIR}/../lib/${.CURDIR} -lrcs
+
+.if exists(${.CURDIR}/../lib/obj)
+LDADD=  -L${.CURDIR}/../lib/obj -lrcs
+.else
+LDADD=  -L${.CURDIR}/../lib/ -lrcs
+.endif
+
 CFLAGS+= -I${.CURDIR}/../lib
 
 .include <bsd.prog.mk>