diff options
| author | unknown <joerg@trift2.> | 2007-08-24 23:29:19 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-08-24 23:29:19 +0200 |
| commit | 35d6bc5551a510c1de7065298a04cacd0bebe2bd (patch) | |
| tree | bf30ee73f4d19407c3bbf07a91bd40bcd1b89114 /netware | |
| parent | 2669e39d88868c8b6cd76b872bbd8fd3b0c20353 (diff) | |
| parent | 454063c5a96ec9904485501cd3a7dd8750937249 (diff) | |
| download | mariadb-git-35d6bc5551a510c1de7065298a04cacd0bebe2bd.tar.gz | |
Merge trift2.:/MySQL/M51/netware2-5.1
into trift2.:/MySQL/M51/push-5.1
netware/BUILD/compile-netware-END:
Auto merged
netware/Makefile.am:
Auto merged
Diffstat (limited to 'netware')
| -rw-r--r-- | netware/Makefile.am | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/netware/Makefile.am b/netware/Makefile.am index 57e8f563d8a..64467a41777 100644 --- a/netware/Makefile.am +++ b/netware/Makefile.am @@ -43,6 +43,11 @@ netware_build_files = client/mysql.def client/mysqladmin.def \ storage/myisam/myisampack.def \ storage/myisam/myisam_ftdump.def +BUILT_SOURCES = link_sources init_db.sql test_db.sql +CLEANFILES = $(BUILT_SOURCES) + +all: $(BUILT_SOURCES) + link_sources: for f in $(netware_build_files); do \ rm -f ../$$f; \ @@ -94,6 +99,8 @@ EXTRA_DIST= $(BUILT_SOURCES) comp_err.def install_test_db.ncf \ BUILD/mwasmnlm BUILD/mwccnlm BUILD/mwenv BUILD/mwldnlm \ BUILD/nwbootstrap BUILD/openssl.imp BUILD/save-patch +endif + # Build init_db.sql from the files that contain # the system tables for this version of MySQL plus any commands @@ -111,9 +118,7 @@ init_db.sql: $(top_srcdir)/scripts/mysql_system_tables.sql \ test_db.sql: init_db.sql $(top_srcdir)/scripts/mysql_test_data_timezone.sql @echo "Building $@"; @cat init_db.sql \ - $(top_srcdir)/scripts/mysql_test_data_timezone.sql >> $@; - -endif + $(top_srcdir)/scripts/mysql_test_data_timezone.sql > $@; # Don't update the files from bitkeeper %::SCCS/s.% |