Commit d0e1dda1 authored by unknown's avatar unknown
Browse files

Merge shellback.(none):/home/msvensson/mysql/work/my50-work 

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
parents cbafa0c6 1c0a0682

extra/yassl/src/Makefile.am

+4 −0
Original line number Diff line number Diff line
@@ -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.%

extra/yassl/taocrypt/src/Makefile.am

+4 −0
Original line number Diff line number Diff line
@@ -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.%

extra/yassl/testsuite/Makefile.am

+4 −0
Original line number Diff line number Diff line
@@ -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.%