summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.blaudden>2007-04-11 09:34:02 +0200
committerunknown <msvensson@pilot.blaudden>2007-04-11 09:34:02 +0200
commit0f299acb7c0e693dc3aa2a98cba5453bcc07d0dd (patch)
tree4ac6f149a3e9c967fd1f3f99f651f4c5d6d6f7de /Makefile.am
parent06f4523d79f7c8509c58e6bee4b84c6ead40fbb2 (diff)
parentc2d2ede33c4c67258676f26f7030ee3d79be5ef2 (diff)
downloadmariadb-git-0f299acb7c0e693dc3aa2a98cba5453bcc07d0dd.tar.gz
Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint BitKeeper/etc/ignore: auto-union Makefile.am: Auto merged configure.in: Auto merged include/Makefile.am: Auto merged libmysqld/Makefile.am: Auto merged client/Makefile.am: Merge netware/Makefile.am: Merge sql/Makefile.am: Merge
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am40
1 files changed, 0 insertions, 40 deletions
diff --git a/Makefile.am b/Makefile.am
index c4a4a040a40..83b99a49f30 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,48 +31,8 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
DIST_SUBDIRS = $(SUBDIRS) BUILD
-# Run these targets before any others, also make part of clean target,
-# to make sure we create new links after a clean.
-BUILT_SOURCES = linked_client_sources linked_server_sources \
- @linked_client_targets@ \
- @linked_libmysqld_targets@ \
- linked_include_sources @linked_netware_sources@
-
-CLEANFILES = $(BUILT_SOURCES)
DISTCLEANFILES = ac_available_languages_fragment
-linked_include_sources:
- cd include; $(MAKE) link_sources
- echo timestamp > linked_include_sources
-
-linked_client_sources: @linked_client_targets@
- cd client; $(MAKE) link_sources
- echo timestamp > linked_client_sources
-
-linked_libmysql_sources:
- cd libmysql; $(MAKE) link_sources
- echo timestamp > linked_libmysql_sources
-
-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
-
-linked_netware_sources:
- cd @netware_dir@; $(MAKE) link_sources
- echo timestamp > linked_netware_sources
-
-linked_server_sources:
- cd sql; $(MAKE) link_sources
- echo timestamp > linked_server_sources
-
# Create permission databases
init-db: all
$(top_builddir)/scripts/mysql_install_db