diff options
| author | unknown <serg@serg.mylan> | 2004-08-20 22:54:42 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-08-20 22:54:42 +0200 |
| commit | 0745a2b783becf4b3ecb095cf8e43f67e333ba90 (patch) | |
| tree | e8510e5d3f6b221a69a2c61f979f3786df718f3a /myisam | |
| parent | 5f74f8d5faf57740cdd43c03a9d5a8d58a357e45 (diff) | |
| download | mariadb-git-0745a2b783becf4b3ecb095cf8e43f67e333ba90.tar.gz | |
after merge fix
myisam/Makefile.am:
put zlib at the end (libtool adds the whole bunch of dependencies right after that)
sql/Makefile.am:
put zlib at the end (libtool adds the whole bunch of dependencies right after that)
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/myisam/Makefile.am b/myisam/Makefile.am index 9f4eef348a3..378e8107814 100644 --- a/myisam/Makefile.am +++ b/myisam/Makefile.am @@ -21,8 +21,7 @@ INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/dbug/libdbug.a \ - @ZLIB_LIBS@ \ - $(top_builddir)/strings/libmystrings.a + $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ pkglib_LIBRARIES = libmyisam.a bin_PROGRAMS = myisamchk myisamlog myisampack myisam_ftdump myisamchk_DEPENDENCIES= $(LIBRARIES) |