update automake
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/0d47ec50 Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/0d47ec50 Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/0d47ec50 Branch: refs/heads/master Commit: 0d47ec50118f4a55bd78b405e3ba1e74c43273bc Parents: b5b943c Author: xiezl <[email protected]> Authored: Sun May 17 09:52:30 2015 +0800 Committer: xiezl <[email protected]> Committed: Sun May 17 09:52:30 2015 +0800 ---------------------------------------------------------------------- Makefile.am | 4 ---- Makefile.in | 30 ------------------------------ 2 files changed, 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/0d47ec50/Makefile.am ---------------------------------------------------------------------- diff --git a/Makefile.am b/Makefile.am index 8ae7bea..89062df 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,9 +23,7 @@ SINGA_SRCS := src/utils/cluster.cc \ src/utils/blob.cc \ src/trainer/server.cc \ src/trainer/worker.cc \ - src/trainer/pm_server.cc \ src/trainer/trainer.cc \ - src/trainer/pm_worker.cc \ src/neuralnet/base_layer.cc \ src/neuralnet/neuralnet.cc \ src/neuralnet/layer.cc \ @@ -43,9 +41,7 @@ SINGA_HDRS := include/utils/cluster.h \ include/utils/updater.h \ include/trainer/server.h \ include/trainer/worker.h \ - include/trainer/pm_worker.h \ include/trainer/trainer.h \ - include/trainer/pm_server.h \ include/neuralnet/base_layer.h \ include/neuralnet/layer.h \ include/neuralnet/neuralnet.h \ http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/0d47ec50/Makefile.in ---------------------------------------------------------------------- diff --git a/Makefile.in b/Makefile.in index 6264e1a..2e84e2b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -75,9 +75,7 @@ am__objects_3 = src/utils/libsinga_la-cluster.lo \ src/utils/libsinga_la-blob.lo \ src/trainer/libsinga_la-server.lo \ src/trainer/libsinga_la-worker.lo \ - src/trainer/libsinga_la-pm_server.lo \ src/trainer/libsinga_la-trainer.lo \ - src/trainer/libsinga_la-pm_worker.lo \ src/neuralnet/libsinga_la-base_layer.lo \ src/neuralnet/libsinga_la-neuralnet.lo \ src/neuralnet/libsinga_la-layer.lo \ @@ -242,9 +240,7 @@ SINGA_SRCS := src/utils/cluster.cc \ src/utils/blob.cc \ src/trainer/server.cc \ src/trainer/worker.cc \ - src/trainer/pm_server.cc \ src/trainer/trainer.cc \ - src/trainer/pm_worker.cc \ src/neuralnet/base_layer.cc \ src/neuralnet/neuralnet.cc \ src/neuralnet/layer.cc \ @@ -262,9 +258,7 @@ SINGA_HDRS := include/utils/cluster.h \ include/utils/updater.h \ include/trainer/server.h \ include/trainer/worker.h \ - include/trainer/pm_worker.h \ include/trainer/trainer.h \ - include/trainer/pm_server.h \ include/neuralnet/base_layer.h \ include/neuralnet/layer.h \ include/neuralnet/neuralnet.h \ @@ -445,12 +439,8 @@ src/trainer/libsinga_la-server.lo: src/trainer/$(am__dirstamp) \ src/trainer/$(DEPDIR)/$(am__dirstamp) src/trainer/libsinga_la-worker.lo: src/trainer/$(am__dirstamp) \ src/trainer/$(DEPDIR)/$(am__dirstamp) -src/trainer/libsinga_la-pm_server.lo: src/trainer/$(am__dirstamp) \ - src/trainer/$(DEPDIR)/$(am__dirstamp) src/trainer/libsinga_la-trainer.lo: src/trainer/$(am__dirstamp) \ src/trainer/$(DEPDIR)/$(am__dirstamp) -src/trainer/libsinga_la-pm_worker.lo: src/trainer/$(am__dirstamp) \ - src/trainer/$(DEPDIR)/$(am__dirstamp) src/neuralnet/$(am__dirstamp): @$(mkdir_p) src/neuralnet @: > src/neuralnet/$(am__dirstamp) @@ -535,10 +525,6 @@ mostlyclean-compile: -rm -f src/proto/libsinga_la-model.pb.$(OBJEXT) -rm -f src/proto/libsinga_la-model.pb.lo -rm -f src/singa-main.$(OBJEXT) - -rm -f src/trainer/libsinga_la-pm_server.$(OBJEXT) - -rm -f src/trainer/libsinga_la-pm_server.lo - -rm -f src/trainer/libsinga_la-pm_worker.$(OBJEXT) - -rm -f src/trainer/libsinga_la-pm_worker.lo -rm -f src/trainer/libsinga_la-server.$(OBJEXT) -rm -f src/trainer/libsinga_la-server.lo -rm -f src/trainer/libsinga_la-trainer.$(OBJEXT) @@ -571,8 +557,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/neuralnet/$(DEPDIR)/libsinga_la-neuralnet.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/proto/$(DEPDIR)/libsinga_la-cluster.pb.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/proto/$(DEPDIR)/libsinga_la-model.pb.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/trainer/$(DEPDIR)/libsinga_la-pm_server.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/trainer/$(DEPDIR)/libsinga_la-pm_worker.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/trainer/$(DEPDIR)/libsinga_la-server.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/trainer/$(DEPDIR)/libsinga_la-trainer.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/trainer/$(DEPDIR)/libsinga_la-worker.Plo@am__quote@ @@ -685,13 +669,6 @@ src/trainer/libsinga_la-worker.lo: src/trainer/worker.cc @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsinga_la_CXXFLAGS) $(CXXFLAGS) -c -o src/trainer/libsinga_la-worker.lo `test -f 'src/trainer/worker.cc' || echo '$(srcdir)/'`src/trainer/worker.cc -src/trainer/libsinga_la-pm_server.lo: src/trainer/pm_server.cc -@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsinga_la_CXXFLAGS) $(CXXFLAGS) -MT src/trainer/libsinga_la-pm_server.lo -MD -MP -MF "src/trainer/$(DEPDIR)/libsinga_la-pm_server.Tpo" -c -o src/trainer/libsinga_la-pm_server.lo `test -f 'src/trainer/pm_server.cc' || echo '$(srcdir)/'`src/trainer/pm_server.cc; \ -@am__fastdepCXX_TRUE@ then mv -f "src/trainer/$(DEPDIR)/libsinga_la-pm_server.Tpo" "src/trainer/$(DEPDIR)/libsinga_la-pm_server.Plo"; else rm -f "src/trainer/$(DEPDIR)/libsinga_la-pm_server.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/trainer/pm_server.cc' object='src/trainer/libsinga_la-pm_server.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsinga_la_CXXFLAGS) $(CXXFLAGS) -c -o src/trainer/libsinga_la-pm_server.lo `test -f 'src/trainer/pm_server.cc' || echo '$(srcdir)/'`src/trainer/pm_server.cc - src/trainer/libsinga_la-trainer.lo: src/trainer/trainer.cc @am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsinga_la_CXXFLAGS) $(CXXFLAGS) -MT src/trainer/libsinga_la-trainer.lo -MD -MP -MF "src/trainer/$(DEPDIR)/libsinga_la-trainer.Tpo" -c -o src/trainer/libsinga_la-trainer.lo `test -f 'src/trainer/trainer.cc' || echo '$(srcdir)/'`src/trainer/trainer.cc; \ @am__fastdepCXX_TRUE@ then mv -f "src/trainer/$(DEPDIR)/libsinga_la-trainer.Tpo" "src/trainer/$(DEPDIR)/libsinga_la-trainer.Plo"; else rm -f "src/trainer/$(DEPDIR)/libsinga_la-trainer.Tpo"; exit 1; fi @@ -699,13 +676,6 @@ src/trainer/libsinga_la-trainer.lo: src/trainer/trainer.cc @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsinga_la_CXXFLAGS) $(CXXFLAGS) -c -o src/trainer/libsinga_la-trainer.lo `test -f 'src/trainer/trainer.cc' || echo '$(srcdir)/'`src/trainer/trainer.cc -src/trainer/libsinga_la-pm_worker.lo: src/trainer/pm_worker.cc -@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsinga_la_CXXFLAGS) $(CXXFLAGS) -MT src/trainer/libsinga_la-pm_worker.lo -MD -MP -MF "src/trainer/$(DEPDIR)/libsinga_la-pm_worker.Tpo" -c -o src/trainer/libsinga_la-pm_worker.lo `test -f 'src/trainer/pm_worker.cc' || echo '$(srcdir)/'`src/trainer/pm_worker.cc; \ -@am__fastdepCXX_TRUE@ then mv -f "src/trainer/$(DEPDIR)/libsinga_la-pm_worker.Tpo" "src/trainer/$(DEPDIR)/libsinga_la-pm_worker.Plo"; else rm -f "src/trainer/$(DEPDIR)/libsinga_la-pm_worker.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/trainer/pm_worker.cc' object='src/trainer/libsinga_la-pm_worker.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsinga_la_CXXFLAGS) $(CXXFLAGS) -c -o src/trainer/libsinga_la-pm_worker.lo `test -f 'src/trainer/pm_worker.cc' || echo '$(srcdir)/'`src/trainer/pm_worker.cc - src/neuralnet/libsinga_la-base_layer.lo: src/neuralnet/base_layer.cc @am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsinga_la_CXXFLAGS) $(CXXFLAGS) -MT src/neuralnet/libsinga_la-base_layer.lo -MD -MP -MF "src/neuralnet/$(DEPDIR)/libsinga_la-base_layer.Tpo" -c -o src/neuralnet/libsinga_la-base_layer.lo `test -f 'src/neuralnet/base_layer.cc' || echo '$(srcdir)/'`src/neuralnet/base_layer.cc; \ @am__fastdepCXX_TRUE@ then mv -f "src/neuralnet/$(DEPDIR)/libsinga_la-base_layer.Tpo" "src/neuralnet/$(DEPDIR)/libsinga_la-base_layer.Plo"; else rm -f "src/neuralnet/$(DEPDIR)/libsinga_la-base_layer.Tpo"; exit 1; fi
