summaryrefslogtreecommitdiff
path: root/mysys/Makefile.am
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2002-11-21 15:56:48 +0200
committermonty@mashka.mysql.fi <>2002-11-21 15:56:48 +0200
commitdac6498f9b5b28d94473baf46c6e6f174943728d (patch)
treed3df5d3fc1abf364dcbcc8eb2305a1cf62540192 /mysys/Makefile.am
parent305d16a7cb3955c20ab5d119b3eb0968008683b6 (diff)
parente60050c4dd652c7a431aebeb95b7dd944be87bf8 (diff)
downloadmariadb-git-dac6498f9b5b28d94473baf46c6e6f174943728d.tar.gz
Merge with 4.0
Diffstat (limited to 'mysys/Makefile.am')
-rw-r--r--mysys/Makefile.am5
1 files changed, 2 insertions, 3 deletions
diff --git a/mysys/Makefile.am b/mysys/Makefile.am
index 5c0a531c37c..2661363de11 100644
--- a/mysys/Makefile.am
+++ b/mysys/Makefile.am
@@ -56,11 +56,10 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c\
EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
thr_mutex.c thr_rwlock.c
libmysys_a_LIBADD = @THREAD_LOBJECTS@
-# test_fn removed 980815 since it not upp to date test_dir
-noinst_PROGRAMS = test_charset charset2html @THREAD_LPROGRAMS@
+noinst_PROGRAMS = charset2html @THREAD_LPROGRAMS@
# test_dir_DEPENDENCIES= $(LIBRARIES)
# testhash_DEPENDENCIES= $(LIBRARIES)
-test_charset_DEPENDENCIES= $(LIBRARIES)
+# test_charset_DEPENDENCIES= $(LIBRARIES)
charset2html_DEPENDENCIES= $(LIBRARIES)
EXTRA_PROGRAMS =
DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \