diff options
| author | monty@mashka.mysql.fi <> | 2003-02-17 05:43:37 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-02-17 05:43:37 +0200 |
| commit | 90bf0744383ea17fc783e405ea4faa2d4f06ae46 (patch) | |
| tree | a3fbfddbae0d5a6e600e68942bb243fadb5269aa /Makefile.am | |
| parent | 6ce8e1e7046df712f442ea96d568f5b21eeb5511 (diff) | |
| parent | 6051b2f9988f1e317be41e49c64718cc610c1260 (diff) | |
| download | mariadb-git-90bf0744383ea17fc783e405ea4faa2d4f06ae46.tar.gz | |
Merge with 4.0.11 tree to get latest bug fixes
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index fc3cc23cf69..9da59074caa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,15 +25,15 @@ SUBDIRS = . include @docs_dirs@ \ @readline_topdir@ @readline_dir@ \ @thread_dirs@ pstack @sql_client_dirs@ \ @sql_server_dirs@ scripts man tests \ - BUILD netware os2 @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ \ - @platform_dir@ + BUILD @netware_dir@ os2 @libmysqld_dirs@ \ + @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ + # Relink after clean linked_sources = linked_client_sources linked_server_sources \ linked_libmysql_sources linked_libmysql_r_sources \ linked_libmysqld_sources linked_libmysqldex_sources \ - linked_include_sources + linked_include_sources @linked_netware_sources@ CLEANFILES = $(linked_sources) @@ -64,6 +64,10 @@ linked_libmysqldex_sources: cd libmysqld/examples; $(MAKE) link_sources echo timestamp > linked_libmysqldex_sources +linked_netware_sources: + cd @netware_dir@; $(MAKE) link_sources + echo timestamp > linked_netware_sources + #avoid recursive make calls in sql directory linked_server_sources: cd sql; rm -f mini_client_errors.c;@LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c @@ -74,7 +78,7 @@ init-db: all $(top_builddir)/scripts/mysql_install_db bin-dist: all - $(top_builddir)/scripts/make_binary_distribution + $(top_builddir)/scripts/make_binary_distribution @MAKE_BINARY_DISTRIBUTION_OPTIONS@ # Remove BK's "SCCS" subdirectories from source distribution dist-hook: @@ -88,3 +92,4 @@ tags: test: cd mysql-test ; ./mysql-test-run + |