diff options
author | brian@zim.(none) <> | 2005-04-26 19:04:36 -0700 |
---|---|---|
committer | brian@zim.(none) <> | 2005-04-26 19:04:36 -0700 |
commit | 2193fd86669001d6caae4009e4be429d00b8710d (patch) | |
tree | b97fc493476d8cae51acff1645233219e2860e93 /storage/ndb/src/common/util/Makefile.am | |
parent | 2a7c71e309337588b3815ea7ff1fe20d734d50d9 (diff) | |
download | mariadb-git-2193fd86669001d6caae4009e4be429d00b8710d.tar.gz |
All changes for change to all storage engines being under storage directory.
Diffstat (limited to 'storage/ndb/src/common/util/Makefile.am')
-rw-r--r-- | storage/ndb/src/common/util/Makefile.am | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/storage/ndb/src/common/util/Makefile.am b/storage/ndb/src/common/util/Makefile.am index 2719d14ee92..7ba3ef941c5 100644 --- a/storage/ndb/src/common/util/Makefile.am +++ b/storage/ndb/src/common/util/Makefile.am @@ -15,7 +15,7 @@ libgeneral_la_SOURCES = \ EXTRA_PROGRAMS = testBitmask testBitmask_SOURCES = testBitmask.cpp testBitmask_LDFLAGS = @ndb_bin_am_ldflags@ \ - $(top_builddir)/ndb/src/libndbclient.la \ + $(top_builddir)/storage/ndb/src/libndbclient.la \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/strings/libmystrings.a @@ -28,8 +28,8 @@ testBitmask.o: $(testBitmask_SOURCES) $(CXXCOMPILE) -c $(INCLUDES) -D__TEST_BITMASK__ $< -include $(top_srcdir)/ndb/config/common.mk.am -include $(top_srcdir)/ndb/config/type_util.mk.am +include $(top_srcdir)/storage/ndb/config/common.mk.am +include $(top_srcdir)/storage/ndb/config/type_util.mk.am # Don't update the files from bitkeeper %::SCCS/s.% @@ -37,13 +37,13 @@ include $(top_srcdir)/ndb/config/type_util.mk.am windoze-dsp: libgeneral.dsp libgeneral.dsp: Makefile \ - $(top_srcdir)/ndb/config/win-lib.am \ - $(top_srcdir)/ndb/config/win-name \ - $(top_srcdir)/ndb/config/win-includes \ - $(top_srcdir)/ndb/config/win-sources \ - $(top_srcdir)/ndb/config/win-libraries - cat $(top_srcdir)/ndb/config/win-lib.am > $@ - @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES) - @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES) - @$(top_srcdir)/ndb/config/win-sources $@ $(libgeneral_la_SOURCES) - @$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD) + $(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_LTLIBRARIES) + @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES) + @$(top_srcdir)/storage/ndb/config/win-sources $@ $(libgeneral_la_SOURCES) + @$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD) |