database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

Makefile.am:

Browse Source 
Avoid duplicate symbol errors on Netware
mwldnlm, mwccnlm, mwasmnlm:
  Filter garbage characters from output
This commit is contained in:
kent@suse9-x86.mysql.com
2006-07-03 10:56:19 +02:00
parent 34d5c36c2b
commit 6b08a98644
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netware/BUILD/mwasmnlm
View File

@@ -5,4 +5,4 @@ set -e
args=" $*" args=" $*"
wine --debugmsg -all -- mwasmnlm $args wine --debugmsg -all -- mwasmnlm $args 2>&1 | sed -e 's/^[[:cntrl:]].*[[:cntrl:]]>//'

2
netware/BUILD/mwccnlm
View File

@@ -7,4 +7,4 @@ set -e
# convert it to "-I../include" # convert it to "-I../include"
args=" "`echo $* | sed -e 's/-I.\/../-I../g'` args=" "`echo $* | sed -e 's/-I.\/../-I../g'`
wine --debugmsg -all -- mwccnlm $args wine --debugmsg -all -- mwccnlm $args 2>&1 | sed -e 's/^[[:cntrl:]].*[[:cntrl:]]>//'

2
netware/BUILD/mwldnlm
View File

@@ -5,4 +5,4 @@ set -e
args=" $*" args=" $*"
wine --debugmsg -all -- mwldnlm $args wine --debugmsg -all -- mwldnlm $args 2>&1 | sed -e 's/^[[:cntrl:]].*[[:cntrl:]]>//'

6
tests/Makefile.am
View File

@@ -42,8 +42,14 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
LIBS = @CLIENT_LIBS@ LIBS = @CLIENT_LIBS@
LDADD = @CLIENT_EXTRA_LDFLAGS@ \ LDADD = @CLIENT_EXTRA_LDFLAGS@ \
$(top_builddir)/libmysql/libmysqlclient.la $(top_builddir)/libmysql/libmysqlclient.la
if HAVE_NETWARE
mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS)
mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix) \
../mysys/my_memmem.c
else
mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) -L../mysys -lmysys mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) -L../mysys -lmysys
mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix) mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix)
endif
insert_test_SOURCES= insert_test.c $(yassl_dummy_link_fix) insert_test_SOURCES= insert_test.c $(yassl_dummy_link_fix)
select_test_SOURCES= select_test.c $(yassl_dummy_link_fix) select_test_SOURCES= select_test.c $(yassl_dummy_link_fix)
insert_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) insert_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)