diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 1609b5a1da1..0dbb5032e15 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,9 +20,17 @@ AUTOMAKE_OPTIONS = foreign # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT -SUBDIRS = . include @docs_dirs@ @readline_dir@ \ +SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ + @readline_topdir@ sql-common \ @thread_dirs@ pstack @sql_client_dirs@ \ - @sql_server_dirs@ scripts @man_dirs@ tests \ + @sql_server_dirs@ scripts man tests \ + netware @libmysqld_dirs@ \ + @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ + +DIST_SUBDIRS = . include @docs_dirs@ zlib \ + @readline_topdir@ sql-common \ + @thread_dirs@ pstack @sql_client_dirs@ \ + @sql_server_dirs@ scripts @man_dirs@ tests SSL\ BUILD netware os2 @libmysqld_dirs@ \ @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ @@ -35,7 +43,7 @@ linked_sources = linked_client_sources linked_server_sources \ CLEANFILES = $(linked_sources) # This is just so that the linking is done early. -config.h: $(linked_sources) +all-local: $(linked_sources) linked_include_sources: cd include; $(MAKE) link_sources @@ -67,7 +75,11 @@ 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 + cd sql; rm -f mini_client_errors.c;\ + @LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c;\ + rm -f pack.c;@LN_CP_F@ ../sql-common/pack.c pack.c;\ + rm -f client.c;@LN_CP_F@ ../sql-common/client.c client.c;\ + rm -f my_time.c;@LN_CP_F@ ../sql-common/my_time.c my_time.c echo timestamp > linked_server_sources # Create permission databases |