diff options
| author | tomas@poseidon.(none) <> | 2004-05-25 11:09:11 +0000 |
|---|---|---|
| committer | tomas@poseidon.(none) <> | 2004-05-25 11:09:11 +0000 |
| commit | 5271b396b843034a2d0e3fb1495c8f9345c01b6f (patch) | |
| tree | 6ebc6e0688f10faa8408e6249e20774acd3036e8 /ndb/config | |
| parent | 1d2b14f711d3dc5aa200eb318a8cc4a6542e817e (diff) | |
| download | mariadb-git-5271b396b843034a2d0e3fb1495c8f9345c01b6f.tar.gz | |
Intermediary commit: Removed some old Makefiles and introduces Makefile.am
Diffstat (limited to 'ndb/config')
| -rwxr-xr-x | ndb/config/GuessConfig.sh_old (renamed from ndb/config/GuessConfig.sh) | 0 | ||||
| -rw-r--r-- | ndb/config/Makefile.am_old (renamed from ndb/config/Makefile.am) | 0 | ||||
| -rw-r--r-- | ndb/config/common.mk.am | 7 | ||||
| -rw-r--r-- | ndb/config/type_kernel.mk.am | 2 | ||||
| -rw-r--r-- | ndb/config/type_mgmapiclient.mk.am | 2 | ||||
| -rw-r--r-- | ndb/config/type_ndbapi.mk.am | 2 | ||||
| -rw-r--r-- | ndb/config/type_ndbapiclient.mk.am | 2 | ||||
| -rw-r--r-- | ndb/config/type_ndbapitest.mk.am | 2 | ||||
| -rw-r--r-- | ndb/config/type_util.mk.am | 7 |
9 files changed, 24 insertions, 0 deletions
diff --git a/ndb/config/GuessConfig.sh b/ndb/config/GuessConfig.sh_old index 8c7886401ba..8c7886401ba 100755 --- a/ndb/config/GuessConfig.sh +++ b/ndb/config/GuessConfig.sh_old diff --git a/ndb/config/Makefile.am b/ndb/config/Makefile.am_old index b5fd81814a1..b5fd81814a1 100644 --- a/ndb/config/Makefile.am +++ b/ndb/config/Makefile.am_old diff --git a/ndb/config/common.mk.am b/ndb/config/common.mk.am new file mode 100644 index 00000000000..efeb6aef52f --- /dev/null +++ b/ndb/config/common.mk.am @@ -0,0 +1,7 @@ + +INCLUDES = +LDADD = $(top_srcdir)/ndb/src/common/portlib/gcc.cpp $(LDADD_LOC) +DEFS = @DEFS@ @NDB_DEFS@ +# ndb cannot be compiled with -fno-implicit-templaces +NDB_CXXFLAGS=-fimplicit-templates +##use AM_CXXFLAGS for other flags diff --git a/ndb/config/type_kernel.mk.am b/ndb/config/type_kernel.mk.am new file mode 100644 index 00000000000..c389a64b936 --- /dev/null +++ b/ndb/config/type_kernel.mk.am @@ -0,0 +1,2 @@ + +INCLUDES += @NDB_KERNEL_INCLUDES@ diff --git a/ndb/config/type_mgmapiclient.mk.am b/ndb/config/type_mgmapiclient.mk.am new file mode 100644 index 00000000000..f3bebb2c756 --- /dev/null +++ b/ndb/config/type_mgmapiclient.mk.am @@ -0,0 +1,2 @@ + +INCLUDES += @NDB_MGMAPICLIENT_INCLUDES@ diff --git a/ndb/config/type_ndbapi.mk.am b/ndb/config/type_ndbapi.mk.am new file mode 100644 index 00000000000..864690cec7b --- /dev/null +++ b/ndb/config/type_ndbapi.mk.am @@ -0,0 +1,2 @@ + +INCLUDES += @NDB_NDBAPI_INCLUDES@ diff --git a/ndb/config/type_ndbapiclient.mk.am b/ndb/config/type_ndbapiclient.mk.am new file mode 100644 index 00000000000..f9655ff9876 --- /dev/null +++ b/ndb/config/type_ndbapiclient.mk.am @@ -0,0 +1,2 @@ + +INCLUDES += @NDB_NDBAPICLIENT_INCLUDES@ diff --git a/ndb/config/type_ndbapitest.mk.am b/ndb/config/type_ndbapitest.mk.am new file mode 100644 index 00000000000..5f4a7313986 --- /dev/null +++ b/ndb/config/type_ndbapitest.mk.am @@ -0,0 +1,2 @@ + +INCLUDES += @NDB_NDBAPITEST_INCLUDES@ diff --git a/ndb/config/type_util.mk.am b/ndb/config/type_util.mk.am new file mode 100644 index 00000000000..8c9c7e0b504 --- /dev/null +++ b/ndb/config/type_util.mk.am @@ -0,0 +1,7 @@ + +LDADD += \ + $(top_srcdir)/ndb/src/common/logger/liblogger.la \ + $(top_srcdir)/ndb/src/common/util/libgeneral.la \ + $(top_srcdir)/ndb/src/common/portlib/unix/libportlib.la + +INCLUDES += @NDB_UTIL_INCLUDES@ |