Merge perch.ndb.mysql.com:/home/jonas/src/51-new

into  perch.ndb.mysql.com:/home/jonas/src/51-ndb

storage/ndb/src/kernel/Makefile.am

@@ -27,21 +27,6 @@ INCLUDES += \
               -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 \

storage/ndb/src/kernel/blocks/Makefile.am

 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

storage/ndb/src/kernel/blocks/backup/Makefile.am

 
-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 @@ include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
 # 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)

storage/ndb/src/kernel/blocks/cmvmi/Makefile.am

-
-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)

storage/ndb/src/kernel/blocks/dbacc/Makefile.am

-
-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)

storage/ndb/src/kernel/blocks/dbdict/Makefile.am

-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 @@ ndb_print_schema_file_LDFLAGS = @ndb_bin_am_ldflags@ \
 # 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)

storage/ndb/src/kernel/blocks/dbdih/Makefile.am

 
-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 @@ ndb_print_sys_file_LDFLAGS = @ndb_bin_am_ldflags@ \
 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)

storage/ndb/src/kernel/blocks/dblqh/Makefile.am

-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 @@ LDADD +=  \
 
 # 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)

storage/ndb/src/kernel/blocks/dbtc/Makefile.am

-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)

storage/ndb/src/kernel/blocks/dbtup/Makefile.am

-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
@@ -28,20 +5,6 @@ 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
 test_varpage_LDFLAGS = @ndb_bin_am_ldflags@ \

storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp

@@ -26,7 +26,7 @@
 #include <md5_hash.hpp>
 
 // big brother
-#include <Dbtup.hpp>
+#include <dbtup/Dbtup.hpp>
 
 // signal classes
 #include <signaldata/DictTabInfo.hpp>

storage/ndb/src/kernel/blocks/dbtux/Makefile.am

-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)

storage/ndb/src/kernel/blocks/dbutil/Makefile.am

-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)

storage/ndb/src/kernel/blocks/ndbcntr/Makefile.am

-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)

storage/ndb/src/kernel/blocks/ndbfs/Makefile.am

-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)

storage/ndb/src/kernel/blocks/qmgr/Makefile.am

-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)

storage/ndb/src/kernel/blocks/suma/Makefile.am

-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)

storage/ndb/src/kernel/blocks/trix/Makefile.am

-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)