List:Commits« Previous MessageNext Message »
From:jonas Date:January 17 2006 8:32am
Subject:bk commit into 5.1 tree (jonas:1.2059)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2059 06/01/17 09:32:16 jonas@stripped +18 -0
  ndb - merge all blocks into one lib, enables better parallell build
     (since am cant build directories in parallell)

  storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
    1.44 06/01/17 09:32:13 jonas@stripped +1 -1
    Merge all blocks into one lib

  storage/ndb/src/kernel/blocks/dbtup/Makefile.am
    1.8 06/01/17 09:32:13 jonas@stripped +0 -37
    Merge all blocks into one lib

  storage/ndb/src/kernel/blocks/dblqh/Makefile.am
    1.7 06/01/17 09:32:13 jonas@stripped +2 -17
    Merge all blocks into one lib

  storage/ndb/src/kernel/blocks/dbdih/Makefile.am
    1.8 06/01/17 09:32:13 jonas@stripped +0 -20
    Merge all blocks into one lib

  storage/ndb/src/kernel/blocks/dbdict/Makefile.am
    1.8 06/01/17 09:32:13 jonas@stripped +0 -16
    Merge all blocks into one lib

  storage/ndb/src/kernel/blocks/backup/Makefile.am
    1.8 06/01/17 09:32:13 jonas@stripped +0 -17
    Merge all blocks into one lib

  storage/ndb/src/kernel/blocks/Makefile.am
    1.6 06/01/17 09:32:13 jonas@stripped +30 -12
    Merge all blocks into one lib

  storage/ndb/src/kernel/Makefile.am
    1.15 06/01/17 09:32:13 jonas@stripped +0 -15
    Merge all blocks into one lib

  BitKeeper/deleted/.del-Makefile.am~e1b9fbc3d07a629d
    1.6 06/01/17 09:22:16 jonas@stripped +0 -26
    Delete: storage/ndb/src/kernel/blocks/ndbcntr/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~c9ae371812ceaf68
    1.6 06/01/17 09:22:16 jonas@stripped +0 -23
    Delete: storage/ndb/src/kernel/blocks/dbutil/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~c65b52fdd2143330
    1.6 06/01/17 09:22:16 jonas@stripped +0 -27
    Delete: storage/ndb/src/kernel/blocks/ndbfs/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~51344ef8d0bbc561
    1.7 06/01/17 09:22:16 jonas@stripped +0 -23
    Delete: storage/ndb/src/kernel/blocks/suma/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~2446a572de707944
    1.6 06/01/17 09:22:16 jonas@stripped +0 -23
    Delete: storage/ndb/src/kernel/blocks/trix/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~1f16f5bcb0850b40
    1.6 06/01/17 09:22:16 jonas@stripped +0 -25
    Delete: storage/ndb/src/kernel/blocks/qmgr/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~e06c16d4515a6ce6
    1.6 06/01/17 09:22:15 jonas@stripped +0 -23
    Delete: storage/ndb/src/kernel/blocks/dbtc/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~b7531a4ddc688658
    1.10 06/01/17 09:22:15 jonas@stripped +0 -36
    Delete: storage/ndb/src/kernel/blocks/dbtux/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~7062fe587bbd7db4
    1.6 06/01/17 09:22:15 jonas@stripped +0 -24
    Delete: storage/ndb/src/kernel/blocks/cmvmi/Makefile.am

  BitKeeper/deleted/.del-Makefile.am~661a7e944c6a2048
    1.8 06/01/17 09:22:15 jonas@stripped +0 -26
    Delete: storage/ndb/src/kernel/blocks/dbacc/Makefile.am

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-ndb

--- 1.43/storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp	2005-11-07 12:19:07 +01:00
+++ 1.44/storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp	2006-01-17 09:32:13 +01:00
@@ -26,7 +26,7 @@
 #include <md5_hash.hpp>
 
 // big brother
-#include <Dbtup.hpp>
+#include <dbtup/Dbtup.hpp>
 
 // signal classes
 #include <signaldata/DictTabInfo.hpp>

--- 1.14/storage/ndb/src/kernel/Makefile.am	2005-11-07 12:19:06 +01:00
+++ 1.15/storage/ndb/src/kernel/Makefile.am	2006-01-17 09:32:13 +01:00
@@ -27,21 +27,6 @@
               -Iblocks
 
 LDADD +=  \
-              blocks/cmvmi/libcmvmi.a \
-              blocks/dbacc/libdbacc.a \
-              blocks/dbdict/libdbdict.a \
-              blocks/dbdih/libdbdih.a \
-              blocks/dblqh/libdblqh.a \
-              blocks/dbtc/libdbtc.a \
-              blocks/dbtup/libdbtup.a \
-              blocks/ndbfs/libndbfs.a \
-              blocks/ndbcntr/libndbcntr.a \
-              blocks/qmgr/libqmgr.a \
-              blocks/trix/libtrix.a \
-              blocks/backup/libbackup.a \
-              blocks/dbutil/libdbutil.a \
-              blocks/suma/libsuma.a \
-              blocks/dbtux/libdbtux.a \
               blocks/libblocks.a \
               vm/libkernel.a	\
               error/liberror.a \

--- 1.5/storage/ndb/src/kernel/blocks/Makefile.am	2005-11-07 12:19:06 +01:00
+++ 1.6/storage/ndb/src/kernel/blocks/Makefile.am	2006-01-17 09:32:13 +01:00
@@ -1,24 +1,42 @@
 SUBDIRS = \
-	cmvmi           \
-	dbacc		\
 	dbdict		\
 	dbdih		\
 	dblqh		\
-	dbtc		\
 	dbtup		\
-	ndbfs           \
-	ndbcntr		\
-	qmgr		\
-	trix            \
-        backup          \
-        dbutil          \
-        suma            \
-	dbtux
+        backup          
 
 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
+libblocks_a_SOURCES = tsman.cpp lgman.cpp pgman.cpp diskpage.cpp restore.cpp\
+  cmvmi/Cmvmi.cpp \
+  dbacc/DbaccInit.cpp dbacc/DbaccMain.cpp \
+  dbdict/Dbdict.cpp \
+  dbdih/DbdihInit.cpp dbdih/DbdihMain.cpp \
+  dblqh/DblqhInit.cpp dblqh/DblqhMain.cpp \
+  dbtc/DbtcInit.cpp dbtc/DbtcMain.cpp \
+  dbtup/DbtupExecQuery.cpp dbtup/DbtupBuffer.cpp \
+  dbtup/DbtupRoutines.cpp dbtup/DbtupCommit.cpp \
+  dbtup/DbtupFixAlloc.cpp dbtup/DbtupTrigger.cpp \
+  dbtup/DbtupAbort.cpp dbtup/DbtupPageMap.cpp \
+  dbtup/DbtupPagMan.cpp dbtup/DbtupStoredProcDef.cpp \
+  dbtup/DbtupMeta.cpp dbtup/DbtupTabDesMan.cpp \
+  dbtup/DbtupGen.cpp dbtup/DbtupIndex.cpp \
+  dbtup/DbtupDebug.cpp dbtup/DbtupScan.cpp \
+  dbtup/DbtupDiskAlloc.cpp dbtup/DbtupVarAlloc.cpp \
+  dbtup/tuppage.cpp dbtup/Undo_buffer.cpp \
+  ndbfs/AsyncFile.cpp ndbfs/Ndbfs.cpp ndbfs/VoidFs.cpp \
+  ndbfs/Filename.cpp ndbfs/CircularIndex.cpp \
+  ndbcntr/NdbcntrInit.cpp ndbcntr/NdbcntrSysTable.cpp ndbcntr/NdbcntrMain.cpp \
+  qmgr/QmgrInit.cpp qmgr/QmgrMain.cpp \
+  trix/Trix.cpp \
+  backup/Backup.cpp backup/BackupInit.cpp \
+  dbutil/DbUtil.cpp \
+  suma/Suma.cpp suma/SumaInit.cpp \
+  dbtux/DbtuxGen.cpp dbtux/DbtuxMeta.cpp dbtux/DbtuxMaint.cpp \
+  dbtux/DbtuxNode.cpp dbtux/DbtuxTree.cpp dbtux/DbtuxScan.cpp \
+  dbtux/DbtuxSearch.cpp dbtux/DbtuxCmp.cpp dbtux/DbtuxStat.cpp \
+  dbtux/DbtuxDebug.cpp
 
 ndbtools_PROGRAMS = ndb_print_file
 ndb_print_file_SOURCES = print_file.cpp diskpage.cpp dbtup/tuppage.cpp

--- 1.7/storage/ndb/src/kernel/blocks/backup/Makefile.am	2005-11-07 12:19:06 +01:00
+++ 1.8/storage/ndb/src/kernel/blocks/backup/Makefile.am	2006-01-17 09:32:13 +01:00
@@ -1,8 +1,4 @@
 
-noinst_LIBRARIES = libbackup.a
-
-libbackup_a_SOURCES = Backup.cpp BackupInit.cpp
-
 ndbtools_PROGRAMS = ndb_print_backup_file
 ndb_print_backup_file_SOURCES = read.cpp
 ndb_print_backup_file_LDFLAGS = @ndb_bin_am_ldflags@ \
@@ -17,16 +13,3 @@
 # Don't update the files from bitkeeper
 %::SCCS/s.%
 
-windoze-dsp: libbackup.dsp
-
-libbackup.dsp: Makefile \
-               $(top_srcdir)/storage/ndb/config/win-lib.am \
-               $(top_srcdir)/storage/ndb/config/win-name \
-               $(top_srcdir)/storage/ndb/config/win-includes \
-               $(top_srcdir)/storage/ndb/config/win-sources \
-               $(top_srcdir)/storage/ndb/config/win-libraries
-	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libbackup_a_SOURCES)
-	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)

--- 1.5/storage/ndb/src/kernel/blocks/cmvmi/Makefile.am	2005-04-27 04:04:32 +02:00
+++ 1.6/BitKeeper/deleted/.del-Makefile.am~7062fe587bbd7db4	2006-01-17 09:22:15 +01:00
@@ -1,24 +0,0 @@
-
-noinst_LIBRARIES = libcmvmi.a
-
-libcmvmi_a_SOURCES = Cmvmi.cpp
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libcmvmi.dsp
-
-libcmvmi.dsp: Makefile \
-               $(top_srcdir)/storage/ndb/config/win-lib.am \
-               $(top_srcdir)/storage/ndb/config/win-name \
-               $(top_srcdir)/storage/ndb/config/win-includes \
-               $(top_srcdir)/storage/ndb/config/win-sources \
-               $(top_srcdir)/storage/ndb/config/win-libraries
-	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libcmvmi_a_SOURCES)
-	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)

--- 1.7/storage/ndb/src/kernel/blocks/dbacc/Makefile.am	2005-04-27 04:04:32 +02:00
+++ 1.8/BitKeeper/deleted/.del-Makefile.am~661a7e944c6a2048	2006-01-17 09:22:15 +01:00
@@ -1,26 +0,0 @@
-
-noinst_LIBRARIES = libdbacc.a
-
-libdbacc_a_SOURCES = DbaccInit.cpp DbaccMain.cpp
-
-INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/kernel/blocks/dbtup
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libdbacc.dsp
-
-libdbacc.dsp: Makefile \
-               $(top_srcdir)/storage/ndb/config/win-lib.am \
-               $(top_srcdir)/storage/ndb/config/win-name \
-               $(top_srcdir)/storage/ndb/config/win-includes \
-               $(top_srcdir)/storage/ndb/config/win-sources \
-               $(top_srcdir)/storage/ndb/config/win-libraries
-	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbacc_a_SOURCES)
-	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)

--- 1.7/storage/ndb/src/kernel/blocks/dbdict/Makefile.am	2005-11-07 12:19:06 +01:00
+++ 1.8/storage/ndb/src/kernel/blocks/dbdict/Makefile.am	2006-01-17 09:32:13 +01:00
@@ -1,6 +1,3 @@
-noinst_LIBRARIES = libdbdict.a
-
-libdbdict_a_SOURCES = Dbdict.cpp
 
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
@@ -23,16 +20,3 @@
 # Don't update the files from bitkeeper
 %::SCCS/s.%
 
-windoze-dsp: libdbdict.dsp
-
-libdbdict.dsp: Makefile \
-               $(top_srcdir)/storage/ndb/config/win-lib.am \
-               $(top_srcdir)/storage/ndb/config/win-name \
-               $(top_srcdir)/storage/ndb/config/win-includes \
-               $(top_srcdir)/storage/ndb/config/win-sources \
-               $(top_srcdir)/storage/ndb/config/win-libraries
-	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbdict_a_SOURCES)
-	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)

--- 1.7/storage/ndb/src/kernel/blocks/dbdih/Makefile.am	2005-11-07 12:19:06 +01:00
+++ 1.8/storage/ndb/src/kernel/blocks/dbdih/Makefile.am	2006-01-17 09:32:13 +01:00
@@ -1,8 +1,4 @@
 
-noinst_LIBRARIES = libdbdih.a
-
-libdbdih_a_SOURCES = DbdihInit.cpp DbdihMain.cpp
-
 ndbtools_PROGRAMS = ndb_print_sys_file
 ndb_print_sys_file_SOURCES = printSysfile.cpp
 ndb_print_sys_file_LDFLAGS = @ndb_bin_am_ldflags@ \
@@ -15,19 +11,3 @@
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
 
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libdbdih.dsp
-
-libdbdih.dsp: Makefile \
-               $(top_srcdir)/storage/ndb/config/win-lib.am \
-               $(top_srcdir)/storage/ndb/config/win-name \
-               $(top_srcdir)/storage/ndb/config/win-includes \
-               $(top_srcdir)/storage/ndb/config/win-sources \
-               $(top_srcdir)/storage/ndb/config/win-libraries
-	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbdih_a_SOURCES)
-	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)

--- 1.6/storage/ndb/src/kernel/blocks/dblqh/Makefile.am	2005-08-25 19:11:30 +02:00
+++ 1.7/storage/ndb/src/kernel/blocks/dblqh/Makefile.am	2006-01-17 09:32:13 +01:00
@@ -1,8 +1,7 @@
-noinst_LIBRARIES = libdblqh.a
 EXTRA_PROGRAMS = ndbd_redo_log_reader
 
-libdblqh_a_SOURCES = DblqhInit.cpp DblqhMain.cpp
-ndbd_redo_log_reader_SOURCES = redoLogReader/records.cpp redoLogReader/redoLogFileReader.cpp
+ndbd_redo_log_reader_SOURCES = redoLogReader/records.cpp \
+  redoLogReader/redoLogFileReader.cpp
 
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
@@ -13,17 +12,3 @@
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%
-
-windoze-dsp: libdblqh.dsp
-
-libdblqh.dsp: Makefile \
-               $(top_srcdir)/storage/ndb/config/win-lib.am \
-               $(top_srcdir)/storage/ndb/config/win-name \
-               $(top_srcdir)/storage/ndb/config/win-includes \
-               $(top_srcdir)/storage/ndb/config/win-sources \
-               $(top_srcdir)/storage/ndb/config/win-libraries
-	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdblqh_a_SOURCES)
-	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)

--- 1.5/storage/ndb/src/kernel/blocks/dbtc/Makefile.am	2005-04-27 04:04:32 +02:00
+++ 1.6/BitKeeper/deleted/.del-Makefile.am~e06c16d4515a6ce6	2006-01-17 09:22:15 +01:00
@@ -1,23 +0,0 @@
-noinst_LIBRARIES = libdbtc.a
-
-libdbtc_a_SOURCES = DbtcInit.cpp DbtcMain.cpp
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libdbtc.dsp
-
-libdbtc.dsp: Makefile \
-               $(top_srcdir)/storage/ndb/config/win-lib.am \
-               $(top_srcdir)/storage/ndb/config/win-name \
-               $(top_srcdir)/storage/ndb/config/win-includes \
-               $(top_srcdir)/storage/ndb/config/win-sources \
-               $(top_srcdir)/storage/ndb/config/win-libraries
-	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbtc_a_SOURCES)
-	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)

--- 1.7/storage/ndb/src/kernel/blocks/dbtup/Makefile.am	2005-11-07 12:19:07 +01:00
+++ 1.8/storage/ndb/src/kernel/blocks/dbtup/Makefile.am	2006-01-17 09:32:13 +01:00
@@ -1,46 +1,9 @@
-noinst_LIBRARIES = libdbtup.a
-
-libdbtup_a_SOURCES = \
-        DbtupExecQuery.cpp \
-        DbtupBuffer.cpp \
-        DbtupRoutines.cpp \
-        DbtupCommit.cpp \
-        DbtupFixAlloc.cpp \
-        DbtupTrigger.cpp \
-        DbtupAbort.cpp \
-        DbtupPageMap.cpp \
-        DbtupPagMan.cpp  \
-        DbtupStoredProcDef.cpp \
-        DbtupMeta.cpp \
-        DbtupTabDesMan.cpp \
-	DbtupGen.cpp \
-	DbtupIndex.cpp \
-        DbtupDebug.cpp \
-	DbtupScan.cpp \
-        DbtupDiskAlloc.cpp DbtupVarAlloc.cpp \
-        tuppage.cpp Undo_buffer.cpp
-
-INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/kernel/blocks/dblqh
 
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%
-
-windoze-dsp: libdbtup.dsp
-
-libdbtup.dsp: Makefile \
-               $(top_srcdir)/storage/ndb/config/win-lib.am \
-               $(top_srcdir)/storage/ndb/config/win-name \
-               $(top_srcdir)/storage/ndb/config/win-includes \
-               $(top_srcdir)/storage/ndb/config/win-sources \
-               $(top_srcdir)/storage/ndb/config/win-libraries
-	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbtup_a_SOURCES)
-	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
 
 ndbtest_PROGRAMS = test_varpage
 test_varpage_SOURCES = test_varpage.cpp tuppage.cpp

--- 1.9/storage/ndb/src/kernel/blocks/dbtux/Makefile.am	2005-11-07 12:19:08 +01:00
+++ 1.10/BitKeeper/deleted/.del-Makefile.am~b7531a4ddc688658	2006-01-17 09:22:15 +01:00
@@ -1,36 +0,0 @@
-noinst_LIBRARIES = libdbtux.a
-
-libdbtux_a_SOURCES = \
-                        DbtuxGen.cpp \
-			DbtuxMeta.cpp \
-			DbtuxMaint.cpp \
-			DbtuxNode.cpp \
-			DbtuxTree.cpp \
-			DbtuxScan.cpp \
-			DbtuxSearch.cpp \
-			DbtuxCmp.cpp \
-			DbtuxStat.cpp \
-			DbtuxDebug.cpp
-
-INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/kernel/blocks/dbtup \
-               -I$(top_srcdir)/storage/ndb/src/kernel/blocks/dblqh
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libdbtux.dsp
-
-libdbtux.dsp: Makefile \
-               $(top_srcdir)/storage/ndb/config/win-lib.am \
-               $(top_srcdir)/storage/ndb/config/win-name \
-               $(top_srcdir)/storage/ndb/config/win-includes \
-               $(top_srcdir)/storage/ndb/config/win-sources \
-               $(top_srcdir)/storage/ndb/config/win-libraries
-	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbtux_a_SOURCES)
-	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)

--- 1.5/storage/ndb/src/kernel/blocks/dbutil/Makefile.am	2005-04-27 04:04:32 +02:00
+++ 1.6/BitKeeper/deleted/.del-Makefile.am~c9ae371812ceaf68	2006-01-17 09:22:16 +01:00
@@ -1,23 +0,0 @@
-noinst_LIBRARIES = libdbutil.a
-
-libdbutil_a_SOURCES = DbUtil.cpp
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libdbutil.dsp
-
-libdbutil.dsp: Makefile \
-               $(top_srcdir)/storage/ndb/config/win-lib.am \
-               $(top_srcdir)/storage/ndb/config/win-name \
-               $(top_srcdir)/storage/ndb/config/win-includes \
-               $(top_srcdir)/storage/ndb/config/win-sources \
-               $(top_srcdir)/storage/ndb/config/win-libraries
-	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbutil_a_SOURCES)
-	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)

--- 1.5/storage/ndb/src/kernel/blocks/ndbcntr/Makefile.am	2005-04-27 04:04:32 +02:00
+++ 1.6/BitKeeper/deleted/.del-Makefile.am~e1b9fbc3d07a629d	2006-01-17 09:22:16 +01:00
@@ -1,26 +0,0 @@
-noinst_LIBRARIES = libndbcntr.a
-
-libndbcntr_a_SOURCES = \
-	NdbcntrInit.cpp	\
-	NdbcntrSysTable.cpp \
-	NdbcntrMain.cpp
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libndbcntr.dsp
-
-libndbcntr.dsp: Makefile \
-               $(top_srcdir)/storage/ndb/config/win-lib.am \
-               $(top_srcdir)/storage/ndb/config/win-name \
-               $(top_srcdir)/storage/ndb/config/win-includes \
-               $(top_srcdir)/storage/ndb/config/win-sources \
-               $(top_srcdir)/storage/ndb/config/win-libraries
-	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libstorage/ndbcntr_a_SOURCES)
-	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)

--- 1.5/storage/ndb/src/kernel/blocks/ndbfs/Makefile.am	2005-04-27 04:04:32 +02:00
+++ 1.6/BitKeeper/deleted/.del-Makefile.am~c65b52fdd2143330	2006-01-17 09:22:16 +01:00
@@ -1,27 +0,0 @@
-noinst_LIBRARIES = libndbfs.a
-
-libndbfs_a_SOURCES = \
-	AsyncFile.cpp			\
-	Ndbfs.cpp VoidFs.cpp	\
-	Filename.cpp			\
-	CircularIndex.cpp
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libndbfs.dsp
-
-libndbfs.dsp: Makefile \
-               $(top_srcdir)/storage/ndb/config/win-lib.am \
-               $(top_srcdir)/storage/ndb/config/win-name \
-               $(top_srcdir)/storage/ndb/config/win-includes \
-               $(top_srcdir)/storage/ndb/config/win-sources \
-               $(top_srcdir)/storage/ndb/config/win-libraries
-	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libstorage/ndbfs_a_SOURCES)
-	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)

--- 1.5/storage/ndb/src/kernel/blocks/qmgr/Makefile.am	2005-04-27 04:04:32 +02:00
+++ 1.6/BitKeeper/deleted/.del-Makefile.am~1f16f5bcb0850b40	2006-01-17 09:22:16 +01:00
@@ -1,25 +0,0 @@
-noinst_LIBRARIES = libqmgr.a
-
-libqmgr_a_SOURCES = \
-	QmgrInit.cpp	\
-	QmgrMain.cpp
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libqmgr.dsp
-
-libqmgr.dsp: Makefile \
-               $(top_srcdir)/storage/ndb/config/win-lib.am \
-               $(top_srcdir)/storage/ndb/config/win-name \
-               $(top_srcdir)/storage/ndb/config/win-includes \
-               $(top_srcdir)/storage/ndb/config/win-sources \
-               $(top_srcdir)/storage/ndb/config/win-libraries
-	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libqmgr_a_SOURCES)
-	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)

--- 1.6/storage/ndb/src/kernel/blocks/suma/Makefile.am	2005-04-27 04:04:32 +02:00
+++ 1.7/BitKeeper/deleted/.del-Makefile.am~51344ef8d0bbc561	2006-01-17 09:22:16 +01:00
@@ -1,23 +0,0 @@
-noinst_LIBRARIES = libsuma.a
-
-libsuma_a_SOURCES = Suma.cpp SumaInit.cpp
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libsuma.dsp
-
-libsuma.dsp: Makefile \
-               $(top_srcdir)/storage/ndb/config/win-lib.am \
-               $(top_srcdir)/storage/ndb/config/win-name \
-               $(top_srcdir)/storage/ndb/config/win-includes \
-               $(top_srcdir)/storage/ndb/config/win-sources \
-               $(top_srcdir)/storage/ndb/config/win-libraries
-	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libsuma_a_SOURCES)
-	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)

--- 1.5/storage/ndb/src/kernel/blocks/trix/Makefile.am	2005-04-27 04:04:32 +02:00
+++ 1.6/BitKeeper/deleted/.del-Makefile.am~2446a572de707944	2006-01-17 09:22:16 +01:00
@@ -1,23 +0,0 @@
-noinst_LIBRARIES = libtrix.a
-
-libtrix_a_SOURCES = Trix.cpp
-
-include $(top_srcdir)/storage/ndb/config/common.mk.am
-include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libtrix.dsp
-
-libtrix.dsp: Makefile \
-               $(top_srcdir)/storage/ndb/config/win-lib.am \
-               $(top_srcdir)/storage/ndb/config/win-name \
-               $(top_srcdir)/storage/ndb/config/win-includes \
-               $(top_srcdir)/storage/ndb/config/win-sources \
-               $(top_srcdir)/storage/ndb/config/win-libraries
-	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libtrix_a_SOURCES)
-	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
Thread
bk commit into 5.1 tree (jonas:1.2059)jonas17 Jan