Module Name: src
Committed By: agc
Date: Sat Nov 6 03:43:00 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist: configure
src/crypto/external/bsd/netpgp/dist/src/lib: Makefile.am Makefile.in
Log Message:
specify the libmj.la archive as a pre-req for libnetpgp.la in the
correct way - tested on RHEL 6 and Mac OS X.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/crypto/external/bsd/netpgp/dist/configure
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am
cvs rdiff -u -r1.13 -r1.14 \
src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/configure
diff -u src/crypto/external/bsd/netpgp/dist/configure:1.37 src/crypto/external/bsd/netpgp/dist/configure:1.38
--- src/crypto/external/bsd/netpgp/dist/configure:1.37 Sat Nov 6 00:14:35 2010
+++ src/crypto/external/bsd/netpgp/dist/configure Sat Nov 6 03:42:59 2010
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 1.38 .
+# From configure.ac Revision: 1.39 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.63 for netpgp 20101105.
#
Index: src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am:1.8 src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am:1.9
--- src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am:1.8 Sat Nov 6 00:03:32 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am Sat Nov 6 03:42:59 2010
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile.am,v 1.8 2010/11/06 00:03:32 agc Exp $
+## $NetBSD: Makefile.am,v 1.9 2010/11/06 03:42:59 agc Exp $
AM_CFLAGS = $(WARNCFLAGS)
@@ -26,6 +26,6 @@
validate.c \
writer.c
-LDADD = ../libmj/libmj.a
+libnetpgp_la_LIBADD = ../libmj/libmj.la
dist_man_MANS = libnetpgp.3
Index: src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in:1.13 src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in:1.14
--- src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in:1.13 Sat Nov 6 00:14:35 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in Sat Nov 6 03:42:59 2010
@@ -52,7 +52,7 @@
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
-libnetpgp_la_LIBADD =
+libnetpgp_la_DEPENDENCIES = ../libmj/libmj.la
am_libnetpgp_la_OBJECTS = libnetpgp_la-bufgap.lo \
libnetpgp_la-compress.lo libnetpgp_la-create.lo \
libnetpgp_la-crypto.lo libnetpgp_la-fastctype.lo \
@@ -225,7 +225,7 @@
validate.c \
writer.c
-LDADD = ../libmj/libmj.a
+libnetpgp_la_LIBADD = ../libmj/libmj.la
dist_man_MANS = libnetpgp.3
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
