diff options
| author | unknown <serg@serg.mylan> | 2006-04-12 14:14:03 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-04-12 14:14:03 +0200 |
| commit | 1f0612d8696b061818ca14b6007dbf33300491fc (patch) | |
| tree | 50d64b7887c6220d23017d5fb7d58d9c45cbaf99 /storage | |
| parent | c6f311a0c1139af34c4b901def7c433d2e7b43ae (diff) | |
| parent | c566f9a25f53ea88ef75d2f4d6e8c6f61745b3e7 (diff) | |
| download | mariadb-git-1f0612d8696b061818ca14b6007dbf33300491fc.tar.gz | |
Auto merged
Makefile.am:
merged
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/Makefile.am | 3 | ||||
| -rw-r--r-- | storage/ndb/Makefile.am | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/Makefile.am b/storage/Makefile.am index 95c49b50890..900e486c6ac 100644 --- a/storage/Makefile.am +++ b/storage/Makefile.am @@ -20,8 +20,7 @@ AUTOMAKE_OPTIONS = foreign # These are built from source in the Docs directory EXTRA_DIST = -SUBDIRS = -DIST_SUBDIRS = . csv example bdb heap innobase myisam myisammrg ndb archive +SUBDIRS = @mysql_se_dirs@ # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/storage/ndb/Makefile.am b/storage/ndb/Makefile.am index 9adb67f89fc..c4ebf5e7688 100644 --- a/storage/ndb/Makefile.am +++ b/storage/ndb/Makefile.am @@ -1,6 +1,7 @@ SUBDIRS = src tools . include @ndb_opt_subdirs@ DIST_SUBDIRS = src tools include test docs EXTRA_DIST = config ndbapi-examples +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in include $(top_srcdir)/storage/ndb/config/common.mk.am |