diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-11-09 12:32:48 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-11-09 12:32:48 +0100 |
| commit | 13cd7170ccadbc596146175c0674956f49aed830 (patch) | |
| tree | ef650a7fd633d354f237aa267a871fce11fe48d3 /Makefile.am | |
| parent | 411a6bfeb94e89f4cd4b8daaee96fe1913218a85 (diff) | |
| download | mariadb-git-13cd7170ccadbc596146175c0674956f49aed830.tar.gz | |
WL#5161 : Cross-platform build with CMake
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index a4b02d23393..498184330ba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,8 @@ AUTOMAKE_OPTIONS = foreign # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ - README COPYING EXCEPTIONS-CLIENT CMakeLists.txt + README COPYING EXCEPTIONS-CLIENT \ + CMakeLists.txt configure.cmake config.h.cmake BUILD-CMAKE SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ @readline_topdir@ sql-common scripts \ @@ -28,8 +29,8 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ @sql_server@ @man_dirs@ tests \ netware @libmysqld_dirs@ \ mysql-test support-files sql-bench \ - win - + win \ + cmake DIST_SUBDIRS = . include Docs zlib \ cmd-line-utils sql-common scripts \ pstack libservices \ @@ -38,6 +39,7 @@ DIST_SUBDIRS = . include Docs zlib \ netware libmysqld \ mysql-test support-files sql-bench \ win \ + cmake \ BUILD DISTCLEANFILES = ac_available_languages_fragment @@ -58,6 +60,7 @@ dist-hook: --datadir=$(distdir)/win/data \ --srcdir=$(top_srcdir) storage/myisam/myisamchk --silent --fast $(distdir)/win/data/mysql/*.MYI + test ! -f configure.am || $(INSTALL_DATA) configure.am $(distdir) all-local: @ABI_CHECK@ |