RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: beecrypt Date: 23-Aug-2010 21:03:57
Branch: HEAD Handle: 2010082319035601
Modified files:
beecrypt Makefile.am configure.ac
beecrypt/c++ Makefile.am
beecrypt/include Makefile.am
beecrypt/java Makefile.am
beecrypt/python Makefile.am
Log:
- beecrypt: snip out C++ and java for --with-beecrypt=internal.
Summary:
Revision Changes Path
1.36 +2 -2 beecrypt/Makefile.am
1.3 +1 -1 beecrypt/c++/Makefile.am
1.26 +4 -4 beecrypt/configure.ac
1.2 +2 -2 beecrypt/include/Makefile.am
1.4 +1 -1 beecrypt/java/Makefile.am
1.7 +1 -1 beecrypt/python/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: beecrypt/Makefile.am
============================================================================
$ cvs diff -u -r1.35 -r1.36 Makefile.am
--- beecrypt/Makefile.am 29 Apr 2010 18:40:40 -0000 1.35
+++ beecrypt/Makefile.am 23 Aug 2010 19:03:56 -0000 1.36
@@ -60,9 +60,9 @@
BEECRYPT_OBJECTS = aes.lo base64.lo beecrypt.lo blockmode.lo blockpad.lo
blowfish.lo blowfishopt.lo dhies.lo dldp.lo dlkp.lo dlpk.lo dlsvdp-dh.lo dsa.lo
elgamal.lo endianness.lo entropy.lo fips186.lo hmac.lo hmacmd5.lo hmacsha1.lo
hmacsha224.lo hmacsha256.lo md4.lo md5.lo memchunk.lo mp.lo mpopt.lo
mpbarrett.lo mpnumber.lo mpprime.lo mtprng.lo pkcs1.lo pkcs12.lo ripemd128.lo
ripemd160.lo ripemd256.lo ripemd320.lo rsa.lo rsakp.lo rsapk.lo sha1.lo
sha1opt.lo sha256.lo sha384.lo sha512.lo sha2k32.lo sha2k64.lo timestamp.lo
-lib_LTLIBRARIES = libbeecrypt.la
+noinst_LTLIBRARIES = libbeecrypt.la
-libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c
blowfish.c dhies.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c
endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha224.c
hmacsha256.c md4.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c
mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c ripemd128.c ripemd160.c
ripemd256.c ripemd320.c rsa.c rsakp.c rsapk.c sha1.c sha224.c sha256.c sha384.c
sha512.c sha2k32.c sha2k64.c timestamp.c cppglue.cxx
+libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c
blowfish.c dhies.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c
endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha224.c
hmacsha256.c md4.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c
mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c ripemd128.c ripemd160.c
ripemd256.c ripemd320.c rsa.c rsakp.c rsapk.c sha1.c sha224.c sha256.c sha384.c
sha512.c sha2k32.c sha2k64.c timestamp.c # cppglue.cxx
libbeecrypt_la_DEPENDENCIES = $(BEECRYPT_OBJECTS)
libbeecrypt_la_LIBADD = blowfishopt.lo mpopt.lo sha1opt.lo $(OPENMP_LIBS)
libbeecrypt_la_LDFLAGS = -no-undefined -version-info
$(LIBBEECRYPT_LT_CURRENT):$(LIBBEECRYPT_LT_REVISION):$(LIBBEECRYPT_LT_AGE)
@@ .
patch -p0 <<'@@ .'
Index: beecrypt/c++/Makefile.am
============================================================================
$ cvs diff -u -r1.2 -r1.3 Makefile.am
--- beecrypt/c++/Makefile.am 29 Apr 2010 18:41:15 -0000 1.2
+++ beecrypt/c++/Makefile.am 23 Aug 2010 19:03:56 -0000 1.3
@@ -10,7 +10,7 @@
cxxdir=$(pkgincludedir)/c++
-lib_LTLIBRARIES = libbeecrypt_cxx.la
+noinst_LTLIBRARIES = libbeecrypt_cxx.la
libbeecrypt_cxx_la_SOURCES = \
adapter.cxx \
@@ .
patch -p0 <<'@@ .'
Index: beecrypt/configure.ac
============================================================================
$ cvs diff -u -r1.25 -r1.26 configure.ac
--- beecrypt/configure.ac 29 Apr 2010 18:40:41 -0000 1.25
+++ beecrypt/configure.ac 23 Aug 2010 19:03:56 -0000 1.26
@@ -74,21 +74,21 @@
fi
],[ac_with_mtmalloc=no])
-AC_ARG_WITH(cplusplus,[ --with-cplusplus creates the C++ API code
[[default=yes]]],[
+AC_ARG_WITH(cplusplus,[ --with-cplusplus creates the C++ API code
[[default=no]]],[
if test "$withval" = no; then
ac_with_cplusplus=no
else
ac_with_cplusplus=yes
fi
- ],[ac_with_cplusplus=yes])
+ ],[ac_with_cplusplus=no])
-AC_ARG_WITH(java,[ --with-java creates the Java glue code
[[default=yes]]],[
+AC_ARG_WITH(java,[ --with-java creates the Java glue code
[[default=no]]],[
if test "$withval" = no; then
ac_with_java=no
else
ac_with_java=yes
fi
- ],[ac_with_java=yes])
+ ],[ac_with_java=no])
AC_ARG_WITH(python,[ --with-python[[=ARG]] creates the Python module
[[default=yes]]; you can optionally specify the python executable],[
if test "$withval" = no; then
@@ .
patch -p0 <<'@@ .'
Index: beecrypt/include/Makefile.am
============================================================================
$ cvs diff -u -r1.1.1.1 -r1.2 Makefile.am
--- beecrypt/include/Makefile.am 29 Apr 2010 16:54:26 -0000 1.1.1.1
+++ beecrypt/include/Makefile.am 23 Aug 2010 19:03:57 -0000 1.2
@@ -1,4 +1,4 @@
-nobase_include_HEADERS = \
+nobase_noinst_HEADERS = \
beecrypt/aes.h \
beecrypt/aesopt.h \
beecrypt/api.h \
@@ -56,7 +56,7 @@
beecrypt/win.h
if WITH_CPLUSPLUS
-nobase_include_HEADERS += \
+nobase_noinst_HEADERS += \
beecrypt/c++/array.h \
beecrypt/c++/mutex.h \
\
@@ .
patch -p0 <<'@@ .'
Index: beecrypt/java/Makefile.am
============================================================================
$ cvs diff -u -r1.3 -r1.4 Makefile.am
--- beecrypt/java/Makefile.am 29 Apr 2010 18:41:39 -0000 1.3
+++ beecrypt/java/Makefile.am 23 Aug 2010 19:03:57 -0000 1.4
@@ -28,7 +28,7 @@
libaltdir=$(prefix)/l...@libalt@
-libalt_LTLIBRARIES = libbeecrypt_java.la
+noinst_LTLIBRARIES = libbeecrypt_java.la
libbeecrypt_java_la_SOURCES = \
beecrypt_tools.c \
@@ .
patch -p0 <<'@@ .'
Index: beecrypt/python/Makefile.am
============================================================================
$ cvs diff -u -r1.6 -r1.7 Makefile.am
--- beecrypt/python/Makefile.am 29 Apr 2010 18:41:40 -0000 1.6
+++ beecrypt/python/Makefile.am 23 Aug 2010 19:03:57 -0000 1.7
@@ -16,7 +16,7 @@
LDADD =
pythondir = @PYTHONLIB@
-python_LTLIBRARIES = _bc.la
+noinst_LTLIBRARIES = _bc.la
_bc_la_SOURCES = _bc-py.c mpw-py.c rng-py.c
_bc_la_LDFLAGS = -avoid-version -module
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
