diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-07-03 12:30:52 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-07-03 12:30:52 +0300 |
| commit | 1557f6d3d91c9706bfaffb21b4a2679097e97bfb (patch) | |
| tree | d483b7e3f5b23930e647cdb94d722eae89c9346a /vio | |
| parent | a9df65e595d6beda3057c9ef37dc3700379500a1 (diff) | |
| download | mariadb-git-1557f6d3d91c9706bfaffb21b4a2679097e97bfb.tar.gz | |
Fixed wrong usage of libvio.a (Bug #556)
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/Makefile.am | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/vio/Makefile.am b/vio/Makefile.am index b53f3be9f91..ab8fac51ee7 100644 --- a/vio/Makefile.am +++ b/vio/Makefile.am @@ -14,21 +14,24 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -INCLUDES = -I$(srcdir)/../include -I../include $(openssl_includes) -LDADD = @CLIENT_EXTRA_LDFLAGS@ libvio.a $(openssl_libs) -pkglib_LIBRARIES = libvio.a +INCLUDES= -I$(srcdir)/../include -I../include $(openssl_includes) +LDADD= @CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) +pkglib_LIBRARIES= libvio.a noinst_PROGRAMS = test-ssl test-sslserver test-sslclient -noinst_HEADERS = -test_ssl_SOURCES = test-ssl.c -test_ssl_LDADD = @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \ - ../strings/libmystrings.a libvio.a $(openssl_libs) -test_sslserver_SOURCES = test-sslserver.c -test_sslserver_LDADD = @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \ - ../strings/libmystrings.a libvio.a $(openssl_libs) -test_sslclient_SOURCES = test-sslclient.c -test_sslclient_LDADD = @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \ - ../strings/libmystrings.a libvio.a $(openssl_libs) -libvio_a_SOURCES = vio.c viosocket.c viossl.c viosslfactories.c +noinst_HEADERS= +test_ssl_SOURCES= test-ssl.c +test_ssl_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \ + ../mysys/libmysys.a ../strings/libmystrings.a \ + $(openssl_libs) +test_sslserver_SOURCES= test-sslserver.c +test_sslserver_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \ + ../mysys/libmysys.a ../strings/libmystrings.a \ + $(openssl_libs) +test_sslclient_SOURCES= test-sslclient.c +test_sslclient_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \ + ../mysys/libmysys.a ../strings/libmystrings.a \ + $(openssl_libs) +libvio_a_SOURCES= vio.c viosocket.c viossl.c viosslfactories.c # Don't update the files from bitkeeper %::SCCS/s.% |