summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorunknown <lenz@mysql.com>2002-11-17 16:45:21 +0100
committerunknown <lenz@mysql.com>2002-11-17 16:45:21 +0100
commit2ef5ec316c2e7a34c6db6060f4869f0fd7026e03 (patch)
tree0d2ca3bfdea2572bf2873e151c96820765460fa1 /strings
parent638d4619ad6551c903f6c4ffbad58973f0af034a (diff)
downloadmariadb-git-2ef5ec316c2e7a34c6db6060f4869f0fd7026e03.tar.gz
- Applied required modifications for automake 1.5
- "make distcheck" needs to be fixed BitKeeper/etc/ignore: Added autom4te.cache/output.0 autom4te.cache/requests autom4te.cache/traces.0 bdb/dist/autom4te.cache/output.0 bdb/dist/autom4te.cache/requests bdb/dist/autom4te.cache/traces.0 innobase/autom4te.cache/output.0 innobase/autom4te.cache/requests innobase/autom4te.cache/traces.0 to the ignore list acinclude.m4: - removed libtool.m4 (is part of libtool 1.4) config.guess: - applied diffs from config.guess of automake 1.5 config.sub: - applied diffs from config.sub of automake 1.5 configure.in: - renamed "AM_PROG_LIBTOOL" -> "AC_PROG_LIBTOOL" - added "AM_PROG_AS" for automake 1.5 dbug/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy extra/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy heap/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy install-sh: - applied diffs from install.sh of automake 1.5 isam/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy libmysql_r/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy ltconfig: - small correction for new libtool ltmain.sh: - applied diffs from ltmain.sh of libtool 1.4.2 merge/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy missing: - applied diffs from missing of automake 1.5 myisam/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy myisammrg/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy mysys/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy - added $(EXEEXT) to test_charset regex/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy sql/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy strings/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy - removed @CHARSET_SRCS@ vio/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy
Diffstat (limited to 'strings')
-rw-r--r--strings/Makefile.am11
1 files changed, 1 insertions, 10 deletions
diff --git a/strings/Makefile.am b/strings/Makefile.am
index a3a58565bbd..a81ba1c17cb 100644
--- a/strings/Makefile.am
+++ b/strings/Makefile.am
@@ -38,7 +38,7 @@ CSRCS = strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.
endif
endif
-libmystrings_a_SOURCES = @CHARSET_SRCS@ $(ASRCS) $(CSRCS)
+libmystrings_a_SOURCES = $(ASRCS) $(CSRCS)
noinst_PROGRAMS = conf_to_src
# Default charset definitions
EXTRA_DIST = ctype-big5.c ctype-czech.c ctype-euc_kr.c \
@@ -54,15 +54,6 @@ EXTRA_DIST = ctype-big5.c ctype-czech.c ctype-euc_kr.c \
strnmov-sparc.s strstr-sparc.s strxmov-sparc.s \
t_ctype.h
-OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\
- __math.h time.h __time.h unistd.h __unistd.h types.h \
- xtypes.h ac-types.h posix.h string.h __string.h \
- errno.h socket.h inet.h dirent.h netdb.h \
- cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \
- prio_queue.h pthread_attr.h pthread_once.h queue.h\
- sleep.h specific.h version.h pwd.h timers.h uio.h \
- cdefs.h machdep.h signal.h __signal.h util.h
-
libmystrings_a_LIBADD= @CHARSET_OBJS@
ctype.o: ctype_extra_sources.c