singa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wan...@apache.org
Subject [3/3] incubator-singa git commit: SINGA-23 fix libtool version mismatch error
Date Fri, 26 Jun 2015 08:02:41 GMT
SINGA-23 fix libtool version mismatch error


Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/9dc0567a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/9dc0567a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/9dc0567a

Branch: refs/heads/master
Commit: 9dc0567a1f6f27126379807a6edd8066b9bec1b4
Parents: c51f926
Author: xiezl <xiezhongle@comp.nus.edu.sg>
Authored: Fri Jun 26 11:01:32 2015 +0800
Committer: xiezl <xiezhongle@comp.nus.edu.sg>
Committed: Fri Jun 26 11:01:32 2015 +0800

----------------------------------------------------------------------
 Makefile.am |    2 +-
 Makefile.in |    8 +-
 aclocal.m4  | 8611 +-----------------------------------------------------
 configure   |    4 +
 4 files changed, 16 insertions(+), 8609 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/9dc0567a/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index ad8025f..1125c01 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-CLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I config
 AUTOMAKE_OPTIONS = foreign subdir-objects
 
 AM_CPPFLAGS = -I$(top_srcdir)/src

http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/9dc0567a/Makefile.in
----------------------------------------------------------------------
diff --git a/Makefile.in b/Makefile.in
index 3ade96e..cbb46b0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,7 +43,11 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
 	config/depcomp config/install-sh config/ltmain.sh \
 	config/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/config/libtool.m4 \
+	$(top_srcdir)/config/ltoptions.m4 \
+	$(top_srcdir)/config/ltsugar.m4 \
+	$(top_srcdir)/config/ltversion.m4 \
+	$(top_srcdir)/config/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -310,7 +314,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-CLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I config
 AUTOMAKE_OPTIONS = foreign subdir-objects
 AM_CPPFLAGS = -I$(top_srcdir)/src
 MSHADOW_FLAGS = -DMSHADOW_USE_CUDA=0 -DMSHADOW_USE_CBLAS=1 -DMSHADOW_USE_MKL=0


Mime
View raw message