diff options
| author | unknown <dlenev@mysql.com> | 2005-01-18 22:13:05 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-01-18 22:13:05 +0300 |
| commit | 96cfa90a7527e1a9c360550ce8bbb74b76de1898 (patch) | |
| tree | 34facdb12da545fb31bc1262409a7e5f185ae4f1 /regex | |
| parent | 845456a7c94f31426c1979e0bcb76a552f8020a2 (diff) | |
| parent | 7041e32d383a903461090c79a746cf2930cd09e8 (diff) | |
| download | mariadb-git-96cfa90a7527e1a9c360550ce8bbb74b76de1898.tar.gz | |
Merge mysql.com:/home/dlenev/src/mysql-4.1-merges
into mysql.com:/home/dlenev/src/mysql-5.0-merges
client/Makefile.am:
Auto merged
strings/Makefile.am:
Auto merged
Diffstat (limited to 'regex')
| -rw-r--r-- | regex/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/regex/Makefile.am b/regex/Makefile.am index 2e23efcbf2a..ee7fc5463b7 100644 --- a/regex/Makefile.am +++ b/regex/Makefile.am @@ -17,12 +17,11 @@ INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include noinst_LIBRARIES = libregex.a -LDADD = libregex.a ../strings/libmystrings.a +LDADD= libregex.a $(top_builddir)/strings/libmystrings.a noinst_HEADERS = cclass.h cname.h regex2.h utils.h engine.c regex.h libregex_a_SOURCES = regerror.c regcomp.c regexec.c regfree.c reginit.c noinst_PROGRAMS = re re_SOURCES = split.c debug.c main.c -re_DEPENDENCIES= $(LIBRARIES) re_LDFLAGS= @NOINST_LDFLAGS@ EXTRA_DIST = tests CHANGES COPYRIGHT WHATSNEW regexp.c \ debug.ih engine.ih main.ih regcomp.ih regerror.ih \ |