several ndb make changes, see respective file

31 files changed, 57 insertions, 20 deletions

diff --git a/ndb/config/common.mk.am b/ndb/config/common.mk.am
index 394da10abd6..593e00d8959 100644
--- a/ndb/config/common.mk.am
+++ b/ndb/config/common.mk.am
@@ -1,17 +1,13 @@
+ndbbindir        = "$(libexecdir)"
+ndbtoolsdir      = "$(bindir)"
+ndbtestdir       = "$(bindir)"
+ndblibdir        = "$(pkglibdir)"
+ndbincludedir    = "$(pkgincludedir)/ndb"
+ndbapiincludedir = "$(pkgincludedir)/ndb/ndbapi"
+mgmapiincludedir = "$(pkgincludedir)/ndb/mgmapi"
 
 INCLUDES = $(INCLUDES_LOC)
 LDADD = $(top_srcdir)/ndb/src/common/portlib/gcc.cpp $(LDADD_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
-
-#noinst_SCRIPTS = ndb_local_bin
-ndb_local_bin: $(PROGRAMS)
-	set -x; \
-	for f in $(PROGRAMS); do \
-	  g=lib/`basename $$f`; \
-	  rm -f $$g; \
-	  @LN_CP_F@ $$f; \
-	done; \
-	touch $@;
diff --git a/ndb/config/Defs.DEBUG.mk b/ndb/config/old_files/Defs.DEBUG.mk
index 309ae90a0ba..309ae90a0ba 100644
--- a/ndb/config/Defs.DEBUG.mk
+++ b/ndb/config/old_files/Defs.DEBUG.mk
diff --git a/ndb/config/Defs.HPUX.HPPA.GCC.mk b/ndb/config/old_files/Defs.HPUX.HPPA.GCC.mk
index 895c7672071..895c7672071 100644
--- a/ndb/config/Defs.HPUX.HPPA.GCC.mk
+++ b/ndb/config/old_files/Defs.HPUX.HPPA.GCC.mk
diff --git a/ndb/config/Defs.IBMAIX.POWERPC.GCC.mk b/ndb/config/old_files/Defs.IBMAIX.POWERPC.GCC.mk
index ae975fb2cb8..ae975fb2cb8 100644
--- a/ndb/config/Defs.IBMAIX.POWERPC.GCC.mk
+++ b/ndb/config/old_files/Defs.IBMAIX.POWERPC.GCC.mk
diff --git a/ndb/config/Defs.LINUX.x86.GCC.mk b/ndb/config/old_files/Defs.LINUX.x86.GCC.mk
index 6167a30ff23..6167a30ff23 100644
--- a/ndb/config/Defs.LINUX.x86.GCC.mk
+++ b/ndb/config/old_files/Defs.LINUX.x86.GCC.mk
diff --git a/ndb/config/Defs.LINUX.x86.ICC.mk b/ndb/config/old_files/Defs.LINUX.x86.ICC.mk
index 8e8540409da..8e8540409da 100644
--- a/ndb/config/Defs.LINUX.x86.ICC.mk
+++ b/ndb/config/old_files/Defs.LINUX.x86.ICC.mk
diff --git a/ndb/config/Defs.LINUX.x86_64.GCC.mk b/ndb/config/old_files/Defs.LINUX.x86_64.GCC.mk
index a238d29ef4c..a238d29ef4c 100644
--- a/ndb/config/Defs.LINUX.x86_64.GCC.mk
+++ b/ndb/config/old_files/Defs.LINUX.x86_64.GCC.mk
diff --git a/ndb/config/Defs.MACOSX.POWERPC.GCC.mk b/ndb/config/old_files/Defs.MACOSX.POWERPC.GCC.mk
index bb73e9bcc61..bb73e9bcc61 100644
--- a/ndb/config/Defs.MACOSX.POWERPC.GCC.mk
+++ b/ndb/config/old_files/Defs.MACOSX.POWERPC.GCC.mk
diff --git a/ndb/config/Defs.OSE.PPC750.DIAB.mk b/ndb/config/old_files/Defs.OSE.PPC750.DIAB.mk
index 8773021a152..8773021a152 100644
--- a/ndb/config/Defs.OSE.PPC750.DIAB.mk
+++ b/ndb/config/old_files/Defs.OSE.PPC750.DIAB.mk
diff --git a/ndb/config/Defs.RELEASE.mk b/ndb/config/old_files/Defs.RELEASE.mk
index fad72d53a43..fad72d53a43 100644
--- a/ndb/config/Defs.RELEASE.mk
+++ b/ndb/config/old_files/Defs.RELEASE.mk
diff --git a/ndb/config/Defs.RELEASE_TRACE.mk b/ndb/config/old_files/Defs.RELEASE_TRACE.mk
index 06726f282e4..06726f282e4 100644
--- a/ndb/config/Defs.RELEASE_TRACE.mk
+++ b/ndb/config/old_files/Defs.RELEASE_TRACE.mk
diff --git a/ndb/config/Defs.SIMCELLO.SOFTOSE.GCC.mk b/ndb/config/old_files/Defs.SIMCELLO.SOFTOSE.GCC.mk
index 8d73e7a752b..8d73e7a752b 100644
--- a/ndb/config/Defs.SIMCELLO.SOFTOSE.GCC.mk
+++ b/ndb/config/old_files/Defs.SIMCELLO.SOFTOSE.GCC.mk
diff --git a/ndb/config/Defs.SOFTOSE.SPARC.GCC.mk b/ndb/config/old_files/Defs.SOFTOSE.SPARC.GCC.mk
index 6788fa956bf..6788fa956bf 100644
--- a/ndb/config/Defs.SOFTOSE.SPARC.GCC.mk
+++ b/ndb/config/old_files/Defs.SOFTOSE.SPARC.GCC.mk
diff --git a/ndb/config/Defs.SOLARIS.SPARC.FORTE6.mk b/ndb/config/old_files/Defs.SOLARIS.SPARC.FORTE6.mk
index 8a95205703d..8a95205703d 100644
--- a/ndb/config/Defs.SOLARIS.SPARC.FORTE6.mk
+++ b/ndb/config/old_files/Defs.SOLARIS.SPARC.FORTE6.mk
diff --git a/ndb/config/Defs.SOLARIS.SPARC.GCC.mk b/ndb/config/old_files/Defs.SOLARIS.SPARC.GCC.mk
index 25920515278..25920515278 100644
--- a/ndb/config/Defs.SOLARIS.SPARC.GCC.mk
+++ b/ndb/config/old_files/Defs.SOLARIS.SPARC.GCC.mk
diff --git a/ndb/config/Defs.SOLARIS.SPARC_64.GCC.mk b/ndb/config/old_files/Defs.SOLARIS.SPARC_64.GCC.mk
index 2b8b9d4cc24..2b8b9d4cc24 100644
--- a/ndb/config/Defs.SOLARIS.SPARC_64.GCC.mk
+++ b/ndb/config/old_files/Defs.SOLARIS.SPARC_64.GCC.mk
diff --git a/ndb/config/Defs.SOLARIS6.SPARC.GCC.mk b/ndb/config/old_files/Defs.SOLARIS6.SPARC.GCC.mk
index f1c570ba101..f1c570ba101 100644
--- a/ndb/config/Defs.SOLARIS6.SPARC.GCC.mk
+++ b/ndb/config/old_files/Defs.SOLARIS6.SPARC.GCC.mk
diff --git a/ndb/config/Defs.TRU64X.ALPHA.GCC.mk b/ndb/config/old_files/Defs.TRU64X.ALPHA.GCC.mk
index ae975fb2cb8..ae975fb2cb8 100644
--- a/ndb/config/Defs.TRU64X.ALPHA.GCC.mk
+++ b/ndb/config/old_files/Defs.TRU64X.ALPHA.GCC.mk
diff --git a/ndb/config/Defs.WIN32.x86.VC7.mk b/ndb/config/old_files/Defs.WIN32.x86.VC7.mk
index e66dacb78e7..e66dacb78e7 100644
--- a/ndb/config/Defs.WIN32.x86.VC7.mk
+++ b/ndb/config/old_files/Defs.WIN32.x86.VC7.mk
diff --git a/ndb/config/GuessConfig.sh_old b/ndb/config/old_files/GuessConfig.sh
index 8c7886401ba..8c7886401ba 100755
--- a/ndb/config/GuessConfig.sh_old
+++ b/ndb/config/old_files/GuessConfig.sh
diff --git a/ndb/config/Makefile.am_old b/ndb/config/old_files/Makefile.am
index b5fd81814a1..b5fd81814a1 100644
--- a/ndb/config/Makefile.am_old
+++ b/ndb/config/old_files/Makefile.am
diff --git a/ndb/config/acinclude.m4 b/ndb/config/old_files/acinclude.m4
index b9edaf801ed..b9edaf801ed 100644
--- a/ndb/config/acinclude.m4
+++ b/ndb/config/old_files/acinclude.m4
diff --git a/ndb/config/config.h.in b/ndb/config/old_files/config.h.in
index 82749d5ece6..82749d5ece6 100644
--- a/ndb/config/config.h.in
+++ b/ndb/config/old_files/config.h.in
diff --git a/ndb/config/configure.in b/ndb/config/old_files/configure.in
index 4fa5ccdb672..4fa5ccdb672 100644
--- a/ndb/config/configure.in
+++ b/ndb/config/old_files/configure.in
diff --git a/ndb/config/type_kernel.mk.am b/ndb/config/type_kernel.mk.am
index c389a64b936..703876ee2e9 100644
--- a/ndb/config/type_kernel.mk.am
+++ b/ndb/config/type_kernel.mk.am
@@ -1,2 +1,18 @@
 
-INCLUDES += @NDB_KERNEL_INCLUDES@
+INCLUDES += \
+        -I$(srcdir) -I$(top_srcdir)/include \
+	-I$(top_srcdir)/ndb/include \
+        -I$(top_srcdir)/ndb/src/kernel/vm \
+        -I$(top_srcdir)/ndb/src/kernel/error \
+	-I$(top_srcdir)/ndb/src/kernel \
+	-I$(top_srcdir)/ndb/include/kernel \
+	-I$(top_srcdir)/ndb/include/transporter \
+	-I$(top_srcdir)/ndb/include/debugger \
+	-I$(top_srcdir)/ndb/include/mgmapi \
+	-I$(top_srcdir)/ndb/include/mgmcommon \
+        -I$(top_srcdir)/ndb/include/ndbapi \
+        -I$(top_srcdir)/ndb/include/util \
+	-I$(top_srcdir)/ndb/include/portlib \
+	-I$(top_srcdir)/ndb/include/logger
+
+#AM_LDFLAGS = @ndb_ldflags@
diff --git a/ndb/config/type_mgmapiclient.mk.am b/ndb/config/type_mgmapiclient.mk.am
index f3bebb2c756..1ef4a81d67e 100644
--- a/ndb/config/type_mgmapiclient.mk.am
+++ b/ndb/config/type_mgmapiclient.mk.am
@@ -1,2 +1,2 @@
 
-INCLUDES += @NDB_MGMAPICLIENT_INCLUDES@
+INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi
diff --git a/ndb/config/type_ndbapi.mk.am b/ndb/config/type_ndbapi.mk.am
index 864690cec7b..ed648273aea 100644
--- a/ndb/config/type_ndbapi.mk.am
+++ b/ndb/config/type_ndbapi.mk.am
@@ -1,2 +1,12 @@
 
-INCLUDES += @NDB_NDBAPI_INCLUDES@
+INCLUDES += \
+        -I$(srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/ndb/include \
+	-I$(top_srcdir)/ndb/include/kernel \
+	-I$(top_srcdir)/ndb/include/transporter \
+	-I$(top_srcdir)/ndb/include/debugger \
+	-I$(top_srcdir)/ndb/include/mgmapi \
+	-I$(top_srcdir)/ndb/include/mgmcommon \
+        -I$(top_srcdir)/ndb/include/ndbapi \
+        -I$(top_srcdir)/ndb/include/util \
+	-I$(top_srcdir)/ndb/include/portlib \
+	-I$(top_srcdir)/ndb/include/logger
diff --git a/ndb/config/type_ndbapiclient.mk.am b/ndb/config/type_ndbapiclient.mk.am
index f9655ff9876..88b57e49e19 100644
--- a/ndb/config/type_ndbapiclient.mk.am
+++ b/ndb/config/type_ndbapiclient.mk.am
@@ -1,2 +1,2 @@
 
-INCLUDES += @NDB_NDBAPICLIENT_INCLUDES@
+INCLUDES += -I$(top_srcdir)/ndb/include/ndbapi
diff --git a/ndb/config/type_ndbapitest.mk.am b/ndb/config/type_ndbapitest.mk.am
index 8aa92ceb6a7..1156a3174c4 100644
--- a/ndb/config/type_ndbapitest.mk.am
+++ b/ndb/config/type_ndbapitest.mk.am
@@ -1,6 +1,11 @@
 
-AM_LDFLAGS = -rpath @ndblibdir@
 LDADD += $(top_srcdir)/ndb/test/src/libNDBT.a \
          $(top_srcdir)/ndb/src/libndbclient.la
 
-INCLUDES += @NDB_NDBAPITEST_INCLUDES@
+INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
+	-I$(top_srcdir)/ndb/include \
+        -I$(top_srcdir)/ndb/include/ndbapi \
+        -I$(top_srcdir)/ndb/include/util \
+        -I$(top_srcdir)/ndb/include/portlib \
+        -I$(top_srcdir)/ndb/test/include \
+        -I$(top_srcdir)/ndb/include/mgmapi
diff --git a/ndb/config/type_ndbapitools.mk.am b/ndb/config/type_ndbapitools.mk.am
index ac302ae9eb4..1156a3174c4 100644
--- a/ndb/config/type_ndbapitools.mk.am
+++ b/ndb/config/type_ndbapitools.mk.am
@@ -1,5 +1,11 @@
 
 LDADD += $(top_srcdir)/ndb/test/src/libNDBT.a \
-         $(top_srcdir)/ndb/src/.libs/libndbclient.a
+         $(top_srcdir)/ndb/src/libndbclient.la
 
-INCLUDES += @NDB_NDBAPITEST_INCLUDES@
+INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
+	-I$(top_srcdir)/ndb/include \
+        -I$(top_srcdir)/ndb/include/ndbapi \
+        -I$(top_srcdir)/ndb/include/util \
+        -I$(top_srcdir)/ndb/include/portlib \
+        -I$(top_srcdir)/ndb/test/include \
+        -I$(top_srcdir)/ndb/include/mgmapi
diff --git a/ndb/config/type_util.mk.am b/ndb/config/type_util.mk.am
index 4a3740ff811..0dfa77b7a7c 100644
--- a/ndb/config/type_util.mk.am
+++ b/ndb/config/type_util.mk.am
@@ -1,2 +1,6 @@
 
-INCLUDES += @NDB_UTIL_INCLUDES@
+INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
+	-I$(top_srcdir)/ndb/include \
+        -I$(top_srcdir)/ndb/include/util \
+        -I$(top_srcdir)/ndb/include/portlib \
+        -I$(top_srcdir)/ndb/include/logger