Browse Source

set up the netpgp lib directory hierarchy a bit more logically

+ move libnetpgp to the same level as libnetpgpverify

+ fix up all paths to the new directory structure
master
agc 8 years ago
parent
commit
c9020acc31
6 changed files with 8 additions and 32 deletions
  1. +0
    -1
      Makefile
  2. +1
    -1
      bin/hkpc/Makefile
  3. +1
    -1
      bin/hkpd/Makefile
  4. +1
    -1
      bin/netpgp/Makefile
  5. +1
    -1
      bin/netpgpkeys/Makefile
  6. +4
    -27
      lib/Makefile

+ 0
- 1
Makefile View File

@ -1,7 +1,6 @@
# $NetBSD$
SUBDIR+= libmj .WAIT
SUBDIR+= lib/verify .WAIT
SUBDIR+= lib .WAIT
SUBDIR+= bin


+ 1
- 1
bin/hkpc/Makefile View File

@ -6,7 +6,7 @@ PROG=hkpc
BINDIR=/usr/bin
SRCS=hkpc.c main.c
LIBNETPGPDIR!= cd ${.CURDIR}/../../lib && ${PRINTOBJDIR}
LIBNETPGPDIR!= cd ${.CURDIR}/../../lib/netpgp && ${PRINTOBJDIR}
LDADD+= -L${LIBNETPGPDIR} -lnetpgp
DPADD+= ${LIBNETPGPDIR}/libnetpgp.a


+ 1
- 1
bin/hkpd/Makefile View File

@ -6,7 +6,7 @@ PROG=hkpd
BINDIR=/usr/sbin
SRCS=hkpd.c main.c
LIBNETPGPDIR!= cd ${.CURDIR}/../../lib && ${PRINTOBJDIR}
LIBNETPGPDIR!= cd ${.CURDIR}/../../lib/netpgp && ${PRINTOBJDIR}
LDADD+= -L${LIBNETPGPDIR} -lnetpgp
DPADD+= ${LIBNETPGPDIR}/libnetpgp.a


+ 1
- 1
bin/netpgp/Makefile View File

@ -7,7 +7,7 @@ BINDIR= /usr/bin
CPPFLAGS+= -I${EXTDIST}/include
LIBNETPGPDIR!= cd ${.CURDIR}/../../lib && ${PRINTOBJDIR}
LIBNETPGPDIR!= cd ${.CURDIR}/../../lib/netpgp && ${PRINTOBJDIR}
LDADD+= -L${LIBNETPGPDIR} -lnetpgp
DPADD+= ${LIBNETPGPDIR}/libnetpgp.a


+ 1
- 1
bin/netpgpkeys/Makefile View File

@ -6,7 +6,7 @@ PROG= netpgpkeys
SRCS= netpgpkeys.c
BINDIR= /usr/bin
LIBNETPGPDIR!= cd ${.CURDIR}/../../lib && ${PRINTOBJDIR}
LIBNETPGPDIR!= cd ${.CURDIR}/../../lib/netpgp && ${PRINTOBJDIR}
LDADD+= -L${LIBNETPGPDIR} -lnetpgp
DPADD+= ${LIBNETPGPDIR}/libnetpgp.a


+ 4
- 27
lib/Makefile View File

@ -1,29 +1,6 @@
# $NetBSD$
# $NetBSD$
.include <bsd.own.mk>
SUBDIR+= netpgp .WAIT
SUBDIR+= verify
USE_FORT?= yes
LIB= netpgp
SRCS+= compress.c create.c crypto.c
SRCS+= keyring.c misc.c netpgp.c openssl_crypto.c packet-parse.c
SRCS+= packet-print.c packet-show.c reader.c signature.c
SRCS+= symmetric.c validate.c writer.c
SRCS+= ssh2pgp.c bufgap.c
CPPFLAGS+= -I${.CURDIR} -I${EXTDIST}/include
MAN= libnetpgp.3
EXTDIST=${.CURDIR}/../dist
.PATH: ${EXTDIST}/include ${EXTDIST}/src/lib
INCS+= netpgp.h
INCSDIR=/usr/include
OPENSSL=${NETBSDSRCDIR}/crypto/external/bsd/openssl
LIBDPLIBS+= mj ${.CURDIR}/../libmj
LIBDPLIBS+= crypto ${OPENSSL}/lib/libcrypto
LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
.include <bsd.lib.mk>
.include <bsd.subdir.mk>

Loading…
Cancel
Save