diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 35db77c684e..87d1c7b5b71 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,17 +20,23 @@ AUTOMAKE_OPTIONS = foreign # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE README \ - COPYING COPYING.LIB MIRRORS + COPYING COPYING.LIB SUBDIRS = include @docs_dirs@ @readline_dir@ \ - @thread_dirs@ @sql_client_dirs@ \ - @sql_server_dirs@ scripts tests man \ - @bench_dirs@ support-files os2 + @thread_dirs@ pstack @sql_client_dirs@ \ + @sql_server_dirs@ @libmysqld_dirs@ scripts man \ + tests BUILD os2 \ + @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ # Relink after clean -CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources +linked_sources = linked_client_sources linked_server_sources \ + linked_libmysql_sources linked_libmysql_r_sources \ + linked_libmysqld_sources linked_libmysqldex_sources \ + linked_include_sources + +CLEANFILES = $(linked_sources) # This is just so that the linking is done early. -config.h: linked_include_sources linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources +config.h: $(linked_sources) linked_include_sources: cd include; $(MAKE) link_sources @@ -48,6 +54,14 @@ linked_libmysql_r_sources: linked_libmysql_sources cd libmysql_r; $(MAKE) link_sources echo timestamp > linked_libmysql_r_sources +linked_libmysqld_sources: + cd libmysqld; $(MAKE) link_sources + echo timestamp > linked_libmysqld_sources + +linked_libmysqldex_sources: + cd libmysqld/examples; $(MAKE) link_sources + echo timestamp > linked_libmysqldex_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 @@ -60,9 +74,12 @@ init-db: all bin-dist: all $(top_builddir)/scripts/make_binary_distribution +tags: + support-files/build-tags .PHONY: init-db bin-dist # Test installation test: cd mysql-test ; ./mysql-test-run + |