diff options
| author | unknown <knielsen@bk-internal.mysql.com> | 2006-09-21 21:23:38 +0200 |
|---|---|---|
| committer | unknown <knielsen@bk-internal.mysql.com> | 2006-09-21 21:23:38 +0200 |
| commit | c9983fcf0db971dadef2e479ad6de1438c70e98a (patch) | |
| tree | 7f812f71a4dae0cbdcf269614ffd7d514c897704 /ndb | |
| parent | 5d3a59fae765f04e912bcf91ea7b1724baf0ba04 (diff) | |
| parent | a5a48382d9271f1533784e3ff1e610e686a7162d (diff) | |
| download | mariadb-git-c9983fcf0db971dadef2e479ad6de1438c70e98a.tar.gz | |
Merge knielsen.mysql.internal:/usr/local/mysql/mysql-4.1
into bk-internal.mysql.com:/tmp/knielsen/mysql-4.1-maint
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/config/common.mk.am | 2 | ||||
| -rw-r--r-- | ndb/config/type_ndbapitools.mk.am | 2 | ||||
| -rw-r--r-- | ndb/src/common/portlib/Makefile.am | 3 | ||||
| -rw-r--r-- | ndb/src/kernel/Makefile.am | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/ndb/config/common.mk.am b/ndb/config/common.mk.am index 869e2fae91d..4df1b0e289a 100644 --- a/ndb/config/common.mk.am +++ b/ndb/config/common.mk.am @@ -7,6 +7,6 @@ ndbapiincludedir = "$(pkgincludedir)/ndb/ndbapi" mgmapiincludedir = "$(pkgincludedir)/ndb/mgmapi" INCLUDES = $(INCLUDES_LOC) -LDADD = $(top_srcdir)/ndb/src/common/portlib/gcc.cpp $(LDADD_LOC) +LDADD = $(LDADD_LOC) -L$(top_srcdir)/ndb/src/common/portlib -lmygcc DEFS = @DEFS@ @NDB_DEFS@ $(DEFS_LOC) $(NDB_EXTRA_FLAGS) NDB_CXXFLAGS=@ndb_cxxflags_fix@ $(NDB_CXXFLAGS_LOC) diff --git a/ndb/config/type_ndbapitools.mk.am b/ndb/config/type_ndbapitools.mk.am index d4eb090112d..679dac09f47 100644 --- a/ndb/config/type_ndbapitools.mk.am +++ b/ndb/config/type_ndbapitools.mk.am @@ -3,7 +3,7 @@ LDADD += \ $(top_builddir)/ndb/src/libndbclient.la \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ + $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ -lmygcc INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \ -I$(top_srcdir)/ndb/include \ diff --git a/ndb/src/common/portlib/Makefile.am b/ndb/src/common/portlib/Makefile.am index 99138a7414e..67b5dbc3001 100644 --- a/ndb/src/common/portlib/Makefile.am +++ b/ndb/src/common/portlib/Makefile.am @@ -1,4 +1,5 @@ -noinst_HEADERS = gcc.cpp +noinst_LIBRARIES = libmygcc.a +libmygcc_a_SOURCES = gcc.cpp noinst_LTLIBRARIES = libportlib.la diff --git a/ndb/src/kernel/Makefile.am b/ndb/src/kernel/Makefile.am index 389cb85c1d8..5b55238c262 100644 --- a/ndb/src/kernel/Makefile.am +++ b/ndb/src/kernel/Makefile.am @@ -53,7 +53,8 @@ LDADD += \ $(top_builddir)/ndb/src/common/util/libgeneral.la \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ + $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ -lmygcc + # Don't update the files from bitkeeper %::SCCS/s.% |