Module Name: othersrc
Committed By: agc
Date: Wed Mar 5 04:57:34 UTC 2014
Modified Files:
othersrc/external/bsd/merkletree/dist: Makefile.in
Added Files:
othersrc/external/bsd/merkletree/dist: Makefile.lib.in
Makefile.libtool.in
Log Message:
merkletree - minor changes for packaging infrastructure
no functional change
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
othersrc/external/bsd/merkletree/dist/Makefile.in
cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/merkletree/dist/Makefile.lib.in \
othersrc/external/bsd/merkletree/dist/Makefile.libtool.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/merkletree/dist/Makefile.in
diff -u othersrc/external/bsd/merkletree/dist/Makefile.in:1.1.1.1 othersrc/external/bsd/merkletree/dist/Makefile.in:1.2
--- othersrc/external/bsd/merkletree/dist/Makefile.in:1.1.1.1 Tue Mar 4 08:38:06 2014
+++ othersrc/external/bsd/merkletree/dist/Makefile.in Wed Mar 5 04:57:34 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.1.1.1 2014/03/04 08:38:06 agc Exp $
+# $NetBSD: Makefile.in,v 1.2 2014/03/05 04:57:34 agc Exp $
PROG=merkletree
@@ -10,7 +10,7 @@ MANDIR=@MANDIR@
all: ${PROG}
${PROG}: ${OBJS}
- ${CC} ${OBJS} -o ${PROG}
+ ${CC} ${OBJS} -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -o ${PROG} -lmultigest
install:
install -c -s ${PROG} ${DESTDIR}${PREFIX}/bin
Added files:
Index: othersrc/external/bsd/merkletree/dist/Makefile.lib.in
diff -u /dev/null othersrc/external/bsd/merkletree/dist/Makefile.lib.in:1.1
--- /dev/null Wed Mar 5 04:57:34 2014
+++ othersrc/external/bsd/merkletree/dist/Makefile.lib.in Wed Mar 5 04:57:34 2014
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile.lib.in,v 1.1 2014/03/05 04:57:34 agc Exp $
+
+LIB= libmerkletree.a
+
+OBJS+= libmerkle.o
+
+PREFIX=@PREFIX@
+MANDIR=@MANDIR@
+
+all: ${LIB}
+
+${LIB}: ${OBJS}
+ ar crv ${LIB} ${OBJS}
+
+install:
+ ${BSD_INSTALL_LIB} ${LIB} ${DESTDIR}${PREFIX}/lib
+ ${BSD_INSTALL_DATA} merkletree.h ${DESTDIR}${PREFIX}/include
+ ${BSD_INSTALL_DATA} libmerkletree.3 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
+
+clean:
+ rm -rf *.core ${OBJS} ${LIB}
+cleandist:
+ rm -rf *.core ${OBJS} ${LIB} Makefile
Index: othersrc/external/bsd/merkletree/dist/Makefile.libtool.in
diff -u /dev/null othersrc/external/bsd/merkletree/dist/Makefile.libtool.in:1.1
--- /dev/null Wed Mar 5 04:57:34 2014
+++ othersrc/external/bsd/merkletree/dist/Makefile.libtool.in Wed Mar 5 04:57:34 2014
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile.libtool.in,v 1.1 2014/03/05 04:57:34 agc Exp $
+
+LIB= libmerkletree.a
+
+OBJS+= libmerkle.o
+
+PREFIX=@PREFIX@
+MANDIR=@MANDIR@
+
+all: ${LIB}
+
+${LIB}: ${OBJS}
+ ${LIBTOOL} --mode=link --tag=CC cc -o ${.TARGET:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 0:0
+
+.c.o:
+ ${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c $<
+
+install:
+ libtool --mode=install ${BSD_INSTALL_LIB} libmerkletree.la ${DESTDIR}${PREFIX}/lib
+ ${BSD_INSTALL_DATA} merkletree.h ${DESTDIR}${PREFIX}/include
+ ${BSD_INSTALL_DATA} libmerkletree.3 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
+
+clean:
+ rm -rf *.core ${OBJS} ${LIB}
+cleandist:
+ rm -rf *.core ${OBJS} ${LIB} Makefile
