upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-08 16:22:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use foo/bar.a' instead of -Lfoo -lbar' for linking to static internal

Browse source 
libraries so that `ld -f' in can create correct dependencies for
yet-to-be-built libraries.

Get the default BINDIR correctly (by including ../Makefile.inc recursively.
This commit is contained in:
Bruce Evans 1998-03-07 09:46:17 +00:00
parent c516ab73b5
commit 15d0bb0b98
12 changed files with 47 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gnu/usr.bin/man/Makefile.inc
View file

@ -2,7 +2,6 @@
# Set a bunch of things to hardcoded paths so that we don't accidently
# pick up a user's own version of some utility and hose ourselves.
#
BINDIR?= /usr/bin
libdir= /etc
bindir= ${BINDIR}
pager= more -s
@ -21,3 +20,13 @@ pic= /usr/bin/pic
zcat= /usr/bin/zcat
compress= /usr/bin/gzip -c
compext= .gz
.if exists(${.OBJDIR}/../lib)
LIBDESTDIR= ${.OBJDIR}/../lib
.else
LIBDESTDIR= ${.CURDIR}/../lib
.endif
LIBMAN= ${LIBDESTDIR}/libman.a
.include "../Makefile.inc"

9
gnu/usr.bin/man/man/Makefile
View file

@ -5,14 +5,9 @@ BINOWN= man
BINMODE=4555
INSTALLFLAGS+= -fschg
.if exists(${.OBJDIR}/../lib)
LIBDESTDIR= ${.OBJDIR}/../lib
.else
LIBDESTDIR= ${.CURDIR}/../lib
.endif
CFLAGS+= -I${LIBDESTDIR}
DPADD= ${LIBDESTDIR}/libman.a
LDADD= -L${LIBDESTDIR} -lman
DPADD= ${LIBMAN}
LDADD= ${LIBMAN}
CFLAGS+= -I${.CURDIR}/../lib -DSTDC_HEADERS -DPOSIX -DHAS_TROFF
CFLAGS+= -DDO_COMPRESS -DALT_SYSTEMS -DSETREUID -DCATMODE=0644

9
gnu/usr.bin/man/manpath/Makefile
View file

@ -2,13 +2,8 @@ PROG= manpath
SRCS= manpath.c
MAN1= manpath.1
.if exists(${.OBJDIR}/../lib)
LIBDESTDIR= ${.OBJDIR}/../lib
.else
LIBDESTDIR= ${.CURDIR}/../lib
.endif
DPADD= ${LIBDESTDIR}/libman.a
LDADD= -L${LIBDESTDIR} -lman
DPADD= ${LIBMAN}
LDADD= ${LIBMAN}
CFLAGS+= -DMAIN -DSTDC_HEADERS -DPOSIX -DHAS_TROFF -DDO_UNCOMPRESS
CFLAGS+= -DALT_SYSTEMS -I${.CURDIR}/../lib -I${.OBJDIR}/../lib

8
usr.sbin/xntpd/Makefile.inc
View file

@ -8,10 +8,16 @@ CLOCKDEFS= -DLOCAL_CLOCK -DPST -DWWVB -DAS2201 -DGOES -DGPSTM -DOMEGA \
-DLEITCH -DTRAK -DACTS -DATOM -DDATUM -DHEATH -DMSFEES \
-DMX4200 -DNMEA -DBOEDER
CFLAGS+= ${NTPDEFS} ${DEFS_LOCAL} ${AUTHDEFS} ${CLOCKDEFS} ${COPTS}
BINDIR?= /usr/sbin
.if exists(${.OBJDIR}/../lib)
LIBNTP= ${.OBJDIR}/../lib/libntp.a
.else
LIBNTP= ${.CURDIR}/../lib/libntp.a
.endif
.if !defined(NOCRYPT) && exists(${.CURDIR}/../../../secure/usr.sbin/xntpd/lib)
AUTHDEFS+= -DDES
.endif
.include "../Makefile.inc"
.endif

13
usr.sbin/xntpd/authstuff/Makefile
View file

@ -1,5 +1,5 @@
#
# $Id$
# $Id: Makefile,v 1.5 1997/02/22 16:14:15 peter Exp $
#
# Most of the programs in this directory are completely useless for the
# NTP configuration that we provide by default.
@ -7,15 +7,8 @@
CFLAGS+= -I${.CURDIR}/../include
.if exists(${.OBJDIR}/../lib)
LDADD+= -L${.OBJDIR}/../lib
DPADD+= ${.OBJDIR}/../lib/libntp.a
.else
LDADD+= -L${.CURDIR}/../lib
DPADD+= ${.CURDIR}/../lib/libntp.a
.endif
LDADD+= -lntp
DPADD= ${LIBNTP}
LDADD= ${LIBNTP}
PROG= md5

6
usr.sbin/xntpd/clockstuff/Makefile
View file

@ -1,10 +1,10 @@
#
# $Id$
# $Id: Makefile,v 1.4 1997/02/22 16:14:17 peter Exp $
#
PROG= propdelay
LDADD+= -L${.CURDIR}/../lib -lntp -lm
DPADD+= ${.CURDIR}/../lib/libntp.a ${LIBM}
DPADD= ${LIBNTP} ${LIBM}
LDADD= ${LIBNTP} -lm
SRCS= propdelay.c
NOMAN=

13
usr.sbin/xntpd/ntpdate/Makefile
View file

@ -1,18 +1,11 @@
#
# $Id$
# $Id: Makefile,v 1.8 1997/02/22 16:14:26 peter Exp $
#
CFLAGS+= -I${.CURDIR}/../include
.if exists(${.OBJDIR}/../lib)
LDADD+= -L${.OBJDIR}/../lib
DPADD+= ${.OBJDIR}/../lib/libntp.a
.else
LDADD+= -L${.CURDIR}/../lib
DPADD+= ${.CURDIR}/../lib/libntp.a
.endif
LDADD+= -lntp
DPADD= ${LIBNTP}
LDADD= ${LIBNTP}
PROG= ntpdate
MAN8= ${.CURDIR}/../doc/ntpdate.8

13
usr.sbin/xntpd/ntpq/Makefile
View file

@ -1,18 +1,11 @@
#
# $Id$
# $Id: Makefile,v 1.8 1997/02/22 16:14:28 peter Exp $
#
CFLAGS+= -I${.CURDIR}/../include
.if exists(${.OBJDIR}/../lib)
LDADD+= -L${.OBJDIR}/../lib
DPADD+= ${.OBJDIR}/../lib/libntp.a
.else
LDADD+= -L${.CURDIR}/../lib
DPADD+= ${.CURDIR}/../lib/libntp.a
.endif
LDADD+= -lntp
DPADD= ${LIBNTP}
LDADD= ${LIBNTP}
PROG= ntpq
MAN8= ${.CURDIR}/../doc/ntpq.8

13
usr.sbin/xntpd/ntptrace/Makefile
View file

@ -1,18 +1,11 @@
#
# $Id$
# $Id: Makefile,v 1.7 1997/02/22 16:14:30 peter Exp $
#
CFLAGS+= -I${.CURDIR}/../include
.if exists(${.OBJDIR}/../lib)
LDADD+= -L${.OBJDIR}/../lib
DPADD+= ${.OBJDIR}/../lib/libntp.a
.else
LDADD+= -L${.CURDIR}/../lib
DPADD+= ${.CURDIR}/../lib/libntp.a
.endif
LDADD+= -lntp
DPADD= ${LIBNTP}
LDADD= ${LIBNTP}
PROG= ntptrace
MAN8= ${.CURDIR}/../doc/ntptrace.8

13
usr.sbin/xntpd/util/Makefile
View file

@ -1,18 +1,11 @@
#
# $Id$
# $Id: Makefile,v 1.7 1997/02/22 16:14:37 peter Exp $
#
CFLAGS+= -I${.CURDIR}/../include
.if exists(${.OBJDIR}/../lib)
LDADD+= -L${.OBJDIR}/../lib
DPADD+= ${.OBJDIR}/../lib/libntp.a
.else
LDADD+= -L${.CURDIR}/../lib
DPADD+= ${.CURDIR}/../lib/libntp.a
.endif
LDADD+= -lntp
DPADD= ${LIBNTP}
LDADD= ${LIBNTP}
PROG= tickadj
MAN8= ${.CURDIR}/../doc/tickadj.8

20
usr.sbin/xntpd/xntpd/Makefile
View file

@ -1,27 +1,17 @@
#
# $Id$
# $Id: Makefile,v 1.11 1997/02/22 16:14:39 peter Exp $
#
CFLAGS+= -I${.CURDIR}/../include
.if exists(${.OBJDIR}/../lib)
LDADD+= -L${.OBJDIR}/../lib
DPADD+= ${.OBJDIR}/../lib/libntp.a
.else
LDADD+= -L${.CURDIR}/../lib
DPADD+= ${.CURDIR}/../lib/libntp.a
.endif
.if exists(${.OBJDIR}/../parse)
LDADD+= -L${.OBJDIR}/../parse
DPADD+= ${.OBJDIR}/../parse/libparse.a
LIBPARSE= ${.OBJDIR}/../parse/libparse.a
.else
LDADD+= -L${.CURDIR}/../parse
DPADD+= ${.CURDIR}/../parse/libparse.a
LIBPARSE= ${.CURDIR}/../parse/libparse.a
.endif
LDADD+= -lntp -lparse -lkvm
DPADD+= ${LIBKVM}
DPADD= ${LIBNTP} ${LIBPARSE} ${LIBKVM}
LDADD= ${LIBNTP} ${LIBPARSE} -lkvm
PROG= xntpd
MAN8= ${.CURDIR}/../doc/xntpd.8

13
usr.sbin/xntpd/xntpdc/Makefile
View file

@ -1,18 +1,11 @@
#
# $Id$
# $Id: Makefile,v 1.7 1997/02/22 16:14:43 peter Exp $
#
CFLAGS+= -I${.CURDIR}/../include
.if exists(${.OBJDIR}/../lib)
LDADD+= -L${.OBJDIR}/../lib
DPADD+= ${.OBJDIR}/../lib/libntp.a
.else
LDADD+= -L${.CURDIR}/../lib
DPADD+= ${.CURDIR}/../lib/libntp.a
.endif
LDADD+= -lntp
DPADD= ${LIBNTP}
LDADD= ${LIBNTP}
PROG= xntpdc
MAN8= ${.CURDIR}/../doc/xntpdc.8