diff options
| author | unknown <kent@mysql.com> | 2005-09-29 03:20:31 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-09-29 03:20:31 +0200 |
| commit | 14650d4f66f9369eedba534a8434fe82c217e66d (patch) | |
| tree | 38ed48baf66a457188a181eeff05f39f32789b9b /regex/Makefile.am | |
| parent | f75271a53e2895c45c555f786982ad5120aed96b (diff) | |
| parent | 72340d672d573d21871b385b8ca5edd29e839a9b (diff) | |
| download | mariadb-git-14650d4f66f9369eedba534a8434fe82c217e66d.tar.gz | |
Merge
client/mysqltest.c:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
os2/MySQL-Source.icc:
Auto merged
regex/Makefile.am:
Auto merged
regex/engine.c:
Auto merged
regex/main.c:
Auto merged
regex/regerror.c:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'regex/Makefile.am')
| -rw-r--r-- | regex/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/regex/Makefile.am b/regex/Makefile.am index 3b161287d36..7e8478e8123 100644 --- a/regex/Makefile.am +++ b/regex/Makefile.am @@ -18,7 +18,7 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include noinst_LIBRARIES = libregex.a LDADD= libregex.a $(top_builddir)/strings/libmystrings.a -noinst_HEADERS = cclass.h cname.h regex2.h utils.h engine.c regex.h +noinst_HEADERS = cclass.h cname.h regex2.h utils.h engine.c my_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 |