diff options
| author | unknown <joerg@mysql.com> | 2006-02-08 19:01:54 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2006-02-08 19:01:54 +0100 |
| commit | 61d9dfd3993cb47298f121ebf0db95e505e426a7 (patch) | |
| tree | 6a6d07e7ed19f34964de7b2af87914aaad30b1f0 | |
| parent | 0a614e7b3f7a648e8d4312228e76b099be37dff9 (diff) | |
| download | mariadb-git-mysql-5.1.6.tar.gz | |
Link errors in 5.1.6 on Solaris in debug builds, overcome by not building two NDB test programs.mysql-5.1.6
storage/ndb/src/kernel/blocks/Makefile.am:
Fix proposed by Jonas Oreland: Stop building "ndb_print_file", it is just for testing.
storage/ndb/src/kernel/blocks/dbtup/Makefile.am:
Fix proposed by Jonas Oreland: Stop building "test_varpage", it is just for testing.
| -rw-r--r-- | storage/ndb/src/kernel/blocks/Makefile.am | 2 | ||||
| -rw-r--r-- | storage/ndb/src/kernel/blocks/dbtup/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/ndb/src/kernel/blocks/Makefile.am b/storage/ndb/src/kernel/blocks/Makefile.am index 389d0cc7aaa..d30ad0c844d 100644 --- a/storage/ndb/src/kernel/blocks/Makefile.am +++ b/storage/ndb/src/kernel/blocks/Makefile.am @@ -20,7 +20,7 @@ noinst_LIBRARIES = libblocks.a INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/kernel/blocks/dblqh libblocks_a_SOURCES = tsman.cpp lgman.cpp pgman.cpp diskpage.cpp restore.cpp -ndbtools_PROGRAMS = ndb_print_file +EXTRA_PROGRAMS = ndb_print_file ndb_print_file_SOURCES = print_file.cpp diskpage.cpp dbtup/tuppage.cpp ndb_print_file_LDFLAGS = @ndb_bin_am_ldflags@ \ $(top_builddir)/storage/ndb/src/libndbclient.la \ diff --git a/storage/ndb/src/kernel/blocks/dbtup/Makefile.am b/storage/ndb/src/kernel/blocks/dbtup/Makefile.am index bc6b975a980..b33f60a9be2 100644 --- a/storage/ndb/src/kernel/blocks/dbtup/Makefile.am +++ b/storage/ndb/src/kernel/blocks/dbtup/Makefile.am @@ -42,7 +42,7 @@ libdbtup.dsp: Makefile \ @$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbtup_a_SOURCES) @$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD) -ndbtest_PROGRAMS = test_varpage +EXTRA_PROGRAMS = test_varpage test_varpage_SOURCES = test_varpage.cpp tuppage.cpp test_varpage_LDFLAGS = @ndb_bin_am_ldflags@ \ $(top_builddir)/storage/ndb/src/libndbclient.la \ |