diff options
author | unknown <acurtis@xiphis.org> | 2006-04-24 13:36:15 -0700 |
---|---|---|
committer | unknown <acurtis@xiphis.org> | 2006-04-24 13:36:15 -0700 |
commit | 1260bc887358d3fc4c060b21eb1c755c3f5dee69 (patch) | |
tree | 8d426c8740820381d4c07c02035f4a4bf29c2fa3 /plugin/Makefile.am | |
parent | 3f63edb362e89df761e575842ac39ef4c86a664c (diff) | |
parent | 5521b1bb9e5c7fb086feb9c731873b5874ccce0a (diff) | |
download | mariadb-git-1260bc887358d3fc4c060b21eb1c755c3f5dee69.tar.gz |
Merge xiphis.org:/home/antony/work2/wl3201.3
into xiphis.org:/home/antony/work2/wl3201.merge
BUILD/SETUP.sh:
Auto merged
libmysqld/Makefile.am:
Auto merged
sql/ha_heap.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/partition_info.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/archive/ha_archive.cc:
Auto merged
storage/archive/ha_archive.h:
Auto merged
storage/example/ha_example.cc:
Auto merged
Makefile.am:
Merge for WL#3201, some post-merge fixes will be required.
configure.in:
Merge for WL#3201
plugin/Makefile.am:
Merge for WL#3201
storage/innobase/Makefile.am:
Merge for WL#3201
Diffstat (limited to 'plugin/Makefile.am')
-rw-r--r-- | plugin/Makefile.am | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/plugin/Makefile.am b/plugin/Makefile.am index d0f68a9c84b..8b421e0ad5a 100644 --- a/plugin/Makefile.am +++ b/plugin/Makefile.am @@ -1,6 +1,27 @@ -SUBDIRS= fulltext +# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# extra plugin example files are listed here, to -# keep its Makefile.am cleaner as a template -EXTRA_DIST= fulltext/configure.in +# Process this file with automake to create Makefile.in +AUTOMAKE_OPTIONS = foreign + +# These are built from source in the Docs directory +EXTRA_DIST = fulltext/configure.in +SUBDIRS = +DIST_SUBDIRS = . fulltext + +# Don't update the files from bitkeeper +%::SCCS/s.% |