diff options
| author | unknown <msvensson@shellback.(none)> | 2006-09-18 19:40:12 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-09-18 19:40:12 +0200 |
| commit | ceac63048de8fd961147b17bc6578863a4720452 (patch) | |
| tree | c66511874aa6363e34cf3755928afaa52a43d16a /extra/yassl | |
| parent | ca000ec0c8602949251735243133760637b27b4a (diff) | |
| parent | af001afb6b075c117c2f6dc1a33b62e647547735 (diff) | |
| download | mariadb-git-ceac63048de8fd961147b17bc6578863a4720452.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into shellback.(none):/home/msvensson/mysql/work/my51-work
extra/yassl/src/Makefile.am:
Auto merged
extra/yassl/testsuite/Makefile.am:
Auto merged
Diffstat (limited to 'extra/yassl')
| -rw-r--r-- | extra/yassl/src/Makefile.am | 4 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/src/Makefile.am | 4 | ||||
| -rw-r--r-- | extra/yassl/testsuite/Makefile.am | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/extra/yassl/src/Makefile.am b/extra/yassl/src/Makefile.am index 2b3e1aea5f5..b68abc11422 100644 --- a/extra/yassl/src/Makefile.am +++ b/extra/yassl/src/Makefile.am @@ -6,3 +6,7 @@ libyassl_la_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \ template_instnt.cpp timer.cpp yassl_imp.cpp yassl_error.cpp yassl_int.cpp EXTRA_DIST = $(wildcard ../include/*.hpp) $(wildcard ../include/openssl/*.h) AM_CXXFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX + +# Don't update the files from bitkeeper +%::SCCS/s.% + diff --git a/extra/yassl/taocrypt/src/Makefile.am b/extra/yassl/taocrypt/src/Makefile.am index 1110ed335b8..df68b1a66c6 100644 --- a/extra/yassl/taocrypt/src/Makefile.am +++ b/extra/yassl/taocrypt/src/Makefile.am @@ -11,3 +11,7 @@ libtaocrypt_la_SOURCES = aes.cpp aestables.cpp algebra.cpp arc4.cpp \ libtaocrypt_la_CXXFLAGS = @yassl_taocrypt_extra_cxxflags@ -DYASSL_PURE_C EXTRA_DIST = $(wildcard ../include/*.hpp) + +# Don't update the files from bitkeeper +%::SCCS/s.% + diff --git a/extra/yassl/testsuite/Makefile.am b/extra/yassl/testsuite/Makefile.am index 2ae46a1b409..5fccab7ee2b 100644 --- a/extra/yassl/testsuite/Makefile.am +++ b/extra/yassl/testsuite/Makefile.am @@ -9,3 +9,7 @@ testsuite_CXXFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX -DNO_MAIN_DRIVER testsuite_LDADD = -lyassl -ltaocrypt testsuite_DEPENDENCIES = ../src/libyassl.la ../taocrypt/src/libtaocrypt.la EXTRA_DIST = testsuite.dsp test.hpp input quit make.bat + +# Don't update the files from bitkeeper +%::SCCS/s.% + |