diff options
| author | unknown <tomas@poseidon.(none)> | 2004-05-27 13:34:17 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.(none)> | 2004-05-27 13:34:17 +0000 |
| commit | a216e205a59f3794320297d10f049c4918b8aaec (patch) | |
| tree | 2150d860da8f96e7f4469da874b8c21637176294 /ndb | |
| parent | a00152e952c16c411b31b7e6d85059c58dd6844d (diff) | |
| parent | 95013a3ba3aaec13b9de5021fabe1358ee361037 (diff) | |
| download | mariadb-git-a216e205a59f3794320297d10f049c4918b8aaec.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/config/common.mk.am | 2 | ||||
| -rw-r--r-- | ndb/src/common/transporter/Makefile.am | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ndb/config/common.mk.am b/ndb/config/common.mk.am index cc320120b2a..394da10abd6 100644 --- a/ndb/config/common.mk.am +++ b/ndb/config/common.mk.am @@ -1,7 +1,7 @@ INCLUDES = $(INCLUDES_LOC) LDADD = $(top_srcdir)/ndb/src/common/portlib/gcc.cpp $(LDADD_LOC) -DEFS = @DEFS@ @NDB_DEFS@ $(DEFS_LOC) +DEFS = @DEFS@ @NDB_DEFS@ $(DEFS_LOC) $(NDB_EXTRA_FLAGS) # ndb cannot be compiled with -fno-implicit-templaces NDB_CXXFLAGS=-fimplicit-templates ##use AM_CXXFLAGS for other flags diff --git a/ndb/src/common/transporter/Makefile.am b/ndb/src/common/transporter/Makefile.am index 8c46cc29051..1eff91a20ca 100644 --- a/ndb/src/common/transporter/Makefile.am +++ b/ndb/src/common/transporter/Makefile.am @@ -6,8 +6,9 @@ libtransporter_la_SOURCES = \ SendBuffer.cpp \ TCP_Transporter.cpp \ TransporterRegistry.cpp \ - Packer.cpp \ - SHM_Transporter.cpp + Packer.cpp + +# SHM_Transporter.cpp include $(top_srcdir)/ndb/config/common.mk.am include $(top_srcdir)/ndb/config/type_util.mk.am |