database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Merge trift2.:/MySQL/M51/netware2-5.1

Browse Source 
into  trift2.:/MySQL/M51/push-5.1


netware/BUILD/compile-netware-END:
  Auto merged
netware/Makefile.am:
  Auto merged
This commit is contained in:
unknown
2007-08-24 23:29:19 +02:00
parent 2669e39d88 454063c5a9
commit 35d6bc5551
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
netware/Makefile.am
View File

@@ -43,6 +43,11 @@ netware_build_files = client/mysql.def client/mysqladmin.def \
storage/myisam/myisampack.def \ storage/myisam/myisampack.def \
storage/myisam/myisam_ftdump.def storage/myisam/myisam_ftdump.def
BUILT_SOURCES = link_sources init_db.sql test_db.sql
CLEANFILES = $(BUILT_SOURCES)
all: $(BUILT_SOURCES)
link_sources: link_sources:
for f in $(netware_build_files); do \ for f in $(netware_build_files); do \
rm -f ../$$f; \ 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/mwasmnlm BUILD/mwccnlm BUILD/mwenv BUILD/mwldnlm \
BUILD/nwbootstrap BUILD/openssl.imp BUILD/save-patch BUILD/nwbootstrap BUILD/openssl.imp BUILD/save-patch
endif
# Build init_db.sql from the files that contain # Build init_db.sql from the files that contain
# the system tables for this version of MySQL plus any commands # 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 test_db.sql: init_db.sql $(top_srcdir)/scripts/mysql_test_data_timezone.sql
@echo "Building $@"; @echo "Building $@";
@cat init_db.sql \ @cat init_db.sql \
$(top_srcdir)/scripts/mysql_test_data_timezone.sql >> $@; $(top_srcdir)/scripts/mysql_test_data_timezone.sql > $@;
endif
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%