summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gnu/usr.bin/binutils/gdb/Makefile31
-rw-r--r--gnu/usr.bin/gdb/gdb/Makefile31
-rw-r--r--usr.sbin/pcvt/kcon/Makefile11
-rw-r--r--usr.sbin/pkg_install/Makefile.inc8
-rw-r--r--usr.sbin/pkg_install/add/Makefile14
-rw-r--r--usr.sbin/pkg_install/create/Makefile14
-rw-r--r--usr.sbin/pkg_install/delete/Makefile14
-rw-r--r--usr.sbin/pkg_install/info/Makefile14
8 files changed, 46 insertions, 91 deletions
diff --git a/gnu/usr.bin/binutils/gdb/Makefile b/gnu/usr.bin/binutils/gdb/Makefile
index 90b5696..e922588 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile
+++ b/gnu/usr.bin/binutils/gdb/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.28 1997/05/02 11:22:51 gj Exp $
+# $Id: Makefile,v 1.29 1997/10/05 09:39:10 jkh Exp $
PROG = gdb
@@ -43,34 +43,21 @@ CLEANFILES+= c-exp.c f-exp.c m2-exp.c init.c y.tab.h init.c-tmp
.ORDER: c-exp.c f-exp.c m2-exp.c
.if exists(${.OBJDIR}/../bfd)
-LDADD+= -L${.OBJDIR}/../bfd -lbfd
-DPADD+= ${.OBJDIR}/../bfd/libbfd.a
+LIBBFD= ${.OBJDIR}/../bfd/libbfd.a
.else
-LDADD+= -L${.CURDIR}/../bfd/ -lbfd
-DPADD+= ${.CURDIR}/../bfd/libbfd.a
+LIBBFD= ${.CURDIR}/../bfd/libbfd.a
.endif
-DPADD+= ${LIBREADLINE} ${LIBGNUREGEX}
-LDADD+= -lreadline -lgnuregex
-
.if exists(${.OBJDIR}/../libiberty)
-LDADD+= -L${.OBJDIR}/../libiberty -liberty
-DPADD+= ${.OBJDIR}/../libiberty/libiberty.a
+LIBIBERTY= ${.OBJDIR}/../libiberty/libiberty.a
.else
-LDADD+= -L${.CURDIR}/../libiberty/ -liberty
-DPADD+= ${.CURDIR}/../libiberty/libiberty.a
+LIBIBERTY= ${.CURDIR}/../libiberty/libiberty.a
.endif
-DPADD+= ${LIBTERMCAP}
-LDADD+= -ltermcap
-
-.if exists(${.OBJDIR}/../libiberty)
-LDADD+= -L${.OBJDIR}/../libiberty -liberty
-DPADD+= ${.OBJDIR}/../libiberty/libiberty.a
-.else
-LDADD+= -L${.CURDIR}/../libiberty/ -liberty
-DPADD+= ${.CURDIR}/../libiberty/libiberty.a
-.endif
+DPADD= ${LIBBFD} ${LIBREADLINE} ${LIBGNUREGEX} ${LIBIBERTY} ${LIBTERMCAP}
+LDADD= ${LIBBFD} -lreadline -lgnuregex ${LIBIBERTY} -ltermcap
+DPADD+= ${LIBIBERTY}
+LDADD+= ${LIBIBERTY}
# We do this by grepping through sources. If that turns out to be too slow,
# maybe we could just require every .o file to have an initialization routine
diff --git a/gnu/usr.bin/gdb/gdb/Makefile b/gnu/usr.bin/gdb/gdb/Makefile
index 90b5696..e922588 100644
--- a/gnu/usr.bin/gdb/gdb/Makefile
+++ b/gnu/usr.bin/gdb/gdb/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.28 1997/05/02 11:22:51 gj Exp $
+# $Id: Makefile,v 1.29 1997/10/05 09:39:10 jkh Exp $
PROG = gdb
@@ -43,34 +43,21 @@ CLEANFILES+= c-exp.c f-exp.c m2-exp.c init.c y.tab.h init.c-tmp
.ORDER: c-exp.c f-exp.c m2-exp.c
.if exists(${.OBJDIR}/../bfd)
-LDADD+= -L${.OBJDIR}/../bfd -lbfd
-DPADD+= ${.OBJDIR}/../bfd/libbfd.a
+LIBBFD= ${.OBJDIR}/../bfd/libbfd.a
.else
-LDADD+= -L${.CURDIR}/../bfd/ -lbfd
-DPADD+= ${.CURDIR}/../bfd/libbfd.a
+LIBBFD= ${.CURDIR}/../bfd/libbfd.a
.endif
-DPADD+= ${LIBREADLINE} ${LIBGNUREGEX}
-LDADD+= -lreadline -lgnuregex
-
.if exists(${.OBJDIR}/../libiberty)
-LDADD+= -L${.OBJDIR}/../libiberty -liberty
-DPADD+= ${.OBJDIR}/../libiberty/libiberty.a
+LIBIBERTY= ${.OBJDIR}/../libiberty/libiberty.a
.else
-LDADD+= -L${.CURDIR}/../libiberty/ -liberty
-DPADD+= ${.CURDIR}/../libiberty/libiberty.a
+LIBIBERTY= ${.CURDIR}/../libiberty/libiberty.a
.endif
-DPADD+= ${LIBTERMCAP}
-LDADD+= -ltermcap
-
-.if exists(${.OBJDIR}/../libiberty)
-LDADD+= -L${.OBJDIR}/../libiberty -liberty
-DPADD+= ${.OBJDIR}/../libiberty/libiberty.a
-.else
-LDADD+= -L${.CURDIR}/../libiberty/ -liberty
-DPADD+= ${.CURDIR}/../libiberty/libiberty.a
-.endif
+DPADD= ${LIBBFD} ${LIBREADLINE} ${LIBGNUREGEX} ${LIBIBERTY} ${LIBTERMCAP}
+LDADD= ${LIBBFD} -lreadline -lgnuregex ${LIBIBERTY} -ltermcap
+DPADD+= ${LIBIBERTY}
+LDADD+= ${LIBIBERTY}
# We do this by grepping through sources. If that turns out to be too slow,
# maybe we could just require every .o file to have an initialization routine
diff --git a/usr.sbin/pcvt/kcon/Makefile b/usr.sbin/pcvt/kcon/Makefile
index 5b58298..77a9f26 100644
--- a/usr.sbin/pcvt/kcon/Makefile
+++ b/usr.sbin/pcvt/kcon/Makefile
@@ -3,15 +3,12 @@ DEVICE= /dev/ttyv0
CFLAGS+= -I${.CURDIR}/../keycap -DKEYB_DEVICE=\"${DEVICE}\"
.if exists(${.OBJDIR}/../keycap)
-LIBDESTDIR= ${.OBJDIR}/../keycap
+LIBKEYCAP= ${.OBJDIR}/../keycap/libkeycap.a
.else
-LIBDESTDIR= ${.CURDIR}/../keycap
+LIBKEYCAP= ${.CURDIR}/../keycap/libkeycap.a
.endif
-# the -Lfoo could be omitted if libkeycap.a were installed before
-# making those programs here
-
-DPADD = ${LIBDESTDIR}/libkeycap.a
-LDADD = -L${LIBDESTDIR} -lkeycap
+DPADD= ${LIBKEYCAP}
+LDADD= ${LIBKEYCAP}
.include <bsd.prog.mk>
diff --git a/usr.sbin/pkg_install/Makefile.inc b/usr.sbin/pkg_install/Makefile.inc
index 50332c0..73ab2a3 100644
--- a/usr.sbin/pkg_install/Makefile.inc
+++ b/usr.sbin/pkg_install/Makefile.inc
@@ -1,2 +1,10 @@
+# $Id$
+
+.if exists(${.OBJDIR}/../lib)
+LIBINSTALL= ${.OBJDIR}/../lib/libinstall.a
+.else
+LIBINSTALL= ${.CURDIR}/../lib/libinstall.a
+.endif
+
# Inherit BINDIR from one level up.
.include "../Makefile.inc"
diff --git a/usr.sbin/pkg_install/add/Makefile b/usr.sbin/pkg_install/add/Makefile
index 83a022e..749285d 100644
--- a/usr.sbin/pkg_install/add/Makefile
+++ b/usr.sbin/pkg_install/add/Makefile
@@ -1,17 +1,11 @@
+# $Id$
+
PROG= pkg_add
CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib
-.if exists(${.OBJDIR}/../lib)
-LDADD+= -L${.OBJDIR}/../lib -linstall
-DPADD+= ${.OBJDIR}/../lib/libinstall.a
-.else
-LDADD+= -L${.CURDIR}/../lib -linstall
-DPADD+= ${.CURDIR}/../lib/libinstall.a
-.endif
-
-LDADD+= -lftpio -lmd
-DPADD+= ${LIBFTPIO} ${LIBMD}
+DPADD= ${LIBINSTALL} ${LIBFTPIO} ${LIBMD}
+LDADD= ${LIBINSTALL} -lftpio -lmd
SRCS= main.c perform.c futil.c extract.c
diff --git a/usr.sbin/pkg_install/create/Makefile b/usr.sbin/pkg_install/create/Makefile
index 01048ac..d347d8e 100644
--- a/usr.sbin/pkg_install/create/Makefile
+++ b/usr.sbin/pkg_install/create/Makefile
@@ -1,17 +1,11 @@
+# $Id$
+
PROG= pkg_create
CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib
-.if exists(${.OBJDIR}/../lib)
-LDADD+= -L${.OBJDIR}/../lib -linstall
-DPADD+= ${.OBJDIR}/../lib/libinstall.a
-.else
-LDADD+= -L${.CURDIR}/../lib -linstall
-DPADD+= ${.CURDIR}/../lib/libinstall.a
-.endif
-
-LDADD+= -lftpio -lmd
-DPADD+= ${LIBFTPIO} ${LIBMD}
+DPADD= ${LIBINSTALL} ${LIBFTPIO} ${LIBMD}
+LDADD= ${LIBINSTALL} -lftpio -lmd
SRCS= main.c perform.c pl.c
diff --git a/usr.sbin/pkg_install/delete/Makefile b/usr.sbin/pkg_install/delete/Makefile
index 20a5717..15b8f56 100644
--- a/usr.sbin/pkg_install/delete/Makefile
+++ b/usr.sbin/pkg_install/delete/Makefile
@@ -1,16 +1,10 @@
+# $Id$
+
PROG= pkg_delete
CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib
-.if exists(${.OBJDIR}/../lib)
-LDADD+= -L${.OBJDIR}/../lib -linstall
-DPADD+= ${.OBJDIR}/../lib/libinstall.a
-.else
-LDADD+= -L${.CURDIR}/../lib -linstall
-DPADD+= ${.CURDIR}/../lib/libinstall.a
-.endif
-
-LDADD+= -lftpio -lmd
-DPADD+= ${LIBFTPIO} ${LIBMD}
+DPADD= ${LIBINSTALL} ${LIBFTPIO} ${LIBMD}
+LDADD= ${LIBINSTALL} -lftpio -lmd
SRCS= main.c perform.c
diff --git a/usr.sbin/pkg_install/info/Makefile b/usr.sbin/pkg_install/info/Makefile
index 29f98d2..e071687 100644
--- a/usr.sbin/pkg_install/info/Makefile
+++ b/usr.sbin/pkg_install/info/Makefile
@@ -1,16 +1,10 @@
+# $Id$
+
PROG= pkg_info
CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib
-.if exists(${.OBJDIR}/../lib)
-LDADD+= -L${.OBJDIR}/../lib -linstall
-DPADD+= ${.OBJDIR}/../lib/libinstall.a
-.else
-LDADD+= -L${.CURDIR}/../lib -linstall
-DPADD+= ${.CURDIR}/../lib/libinstall.a
-.endif
-
-LDADD+= -lftpio -lmd
-DPADD+= ${LIBFTPIO} ${LIBMD}
+DPADD= ${LIBINSTALL} ${LIBFTPIO} ${LIBMD}
+LDADD= ${LIBINSTALL} -lftpio -lmd
SRCS= main.c perform.c show.c
OpenPOWER on IntegriCloud