diff options
author | unknown <knielsen@mysql.com> | 2006-03-24 22:50:56 +0100 |
---|---|---|
committer | unknown <knielsen@mysql.com> | 2006-03-24 22:50:56 +0100 |
commit | 230eab3c68cb26fa743e82d0452f0b83359a10ff (patch) | |
tree | 4a3cb807ddfab7cd04cb6caf42623f824843f884 /Makefile.am | |
parent | a69a37835c1b3823b359b7a4e1ae7bdafd33a08a (diff) | |
download | mariadb-git-230eab3c68cb26fa743e82d0452f0b83359a10ff.tar.gz |
Some changes to make it possible to build for Windows with CMake from
a normal 'make dist' source .tar.gz.
libmysql/mytest.c:
bk cp VC++Files/libmysqltest/mytest.c libmysql/mytest.c
sql/message.mc:
bk cp VC++Files/sql/message.mc sql/message.mc
Makefile.am:
Add Windows CMake stuff.
client/Makefile.am:
Add extra files needed for CMake Windows build.
cmakelists.txt:
Fix subdir order to make CMake dependency calculations happy.
configure.in:
Add extra files needed for CMake Windows build.
extra/Makefile.am:
Add extra files needed for CMake Windows build.
extra/yassl/Makefile.am:
Add extra files needed for CMake Windows build.
libmysql/Makefile.am:
Add extra files needed for CMake Windows build.
libmysql/cmakelists.txt:
Move mytest.c to a more sensible location.
libmysqld/Makefile.am:
Add extra files needed for CMake Windows build.
mysys/Makefile.am:
Add extra files needed for CMake Windows build.
regex/Makefile.am:
Add extra files needed for CMake Windows build.
server-tools/instance-manager/Makefile.am:
Add extra files needed for CMake Windows build.
sql/Makefile.am:
Add extra files needed for CMake Windows build.
sql/cmakelists.txt:
Move message.mc to a more sensible location.
Add some dependencies to avoid a stale handlerton.cc.
storage/archive/Makefile.am:
Add extra files needed for CMake Windows build.
storage/bdb/Makefile.in:
Add extra files needed for CMake Windows build.
storage/example/Makefile.am:
Add extra files needed for CMake Windows build.
storage/heap/Makefile.am:
Add extra files needed for CMake Windows build.
storage/innobase/Makefile.am:
Add extra files needed for CMake Windows build.
storage/innobase/include/univ.i:
Avoid including Unix config in Windows build.
storage/myisam/Makefile.am:
Add extra files needed for CMake Windows build.
storage/myisammrg/Makefile.am:
Add extra files needed for CMake Windows build.
strings/Makefile.am:
Add extra files needed for CMake Windows build.
tests/Makefile.am:
Add extra files needed for CMake Windows build.
vio/Makefile.am:
Add extra files needed for CMake Windows build.
zlib/Makefile.am:
Add extra files needed for CMake Windows build.
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index f2450dffb45..3d49ce03c12 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ AUTOMAKE_OPTIONS = foreign # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ - README COPYING EXCEPTIONS-CLIENT + README COPYING EXCEPTIONS-CLIENT cmakelists.txt SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \ @readline_topdir@ sql-common \ @thread_dirs@ pstack \ @@ -29,7 +29,7 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \ @mysql_se_plugins@ \ netware @libmysqld_dirs@ \ @bench_dirs@ support-files @tools_dirs@ \ - plugin + plugin win DIST_SUBDIRS = . include @docs_dirs@ zlib \ @readline_topdir@ sql-common \ @@ -39,7 +39,7 @@ DIST_SUBDIRS = . include @docs_dirs@ zlib \ @man_dirs@ tests SSL\ BUILD netware os2 @libmysqld_dirs@\ @bench_dirs@ support-files server-tools tools \ - plugin + plugin win # Run these targets before any others, also make part of clean target, # to make sure we create new links after a clean. |