This is an automated email from the git hooks/post-receive script. hmmr-guest pushed a commit to branch WIP in repository cnrun.
commit 86a2816bb5f95c4f593e30c40c5c24214df13de9 Author: Andrei Zavada <[email protected]> Date: Sun Mar 23 18:22:06 2014 +0200 move cnrun into own dir under src/, too, optimise Makefile.am's --- upstream/configure.ac | 3 +- upstream/src/.gitignore | 4 --- upstream/src/Common.mk | 10 ++++++ upstream/src/Makefile.am | 37 ++++++---------------- upstream/src/cnrun/.gitignore | 1 + upstream/src/cnrun/Makefile.am | 20 ++++++++++++ .../{ => cnrun}/runner-interpreter-completions.cc | 4 +++ upstream/src/{ => cnrun}/runner-interpreter.cc | 4 +++ upstream/src/{ => cnrun}/runner-main.cc | 5 ++- upstream/src/{ => cnrun}/runner.hh | 4 +++ upstream/src/libcn/Makefile.am | 27 ++-------------- upstream/src/libstilton/Makefile.am | 16 ++++++---- upstream/src/tools/Makefile.am | 10 +++--- 13 files changed, 75 insertions(+), 70 deletions(-) diff --git a/upstream/configure.ac b/upstream/configure.ac index 0b038b1..ccdd2f3 100644 --- a/upstream/configure.ac +++ b/upstream/configure.ac @@ -1,7 +1,7 @@ AC_COPYRIGHT([Copyright (c) 2008-14 Andrei Zavada <[email protected]>]) AC_INIT([cnrun], [1.1.15_rc], [[email protected]]) -AC_CONFIG_SRCDIR([src/runner-main.cc]) +AC_CONFIG_SRCDIR([src/cnrun/runner-main.cc]) AC_CONFIG_MACRO_DIR([m4]) AC_PREREQ(2.61) @@ -88,6 +88,7 @@ AC_OUTPUT([ src/Makefile src/libstilton/Makefile src/libcn/Makefile + src/cnrun/Makefile doc/Makefile man/cnrun.1 man/spike2sdf.1 diff --git a/upstream/src/.gitignore b/upstream/src/.gitignore deleted file mode 100644 index 20017ce..0000000 --- a/upstream/src/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -cnrun -varfold -hh-latency-estimator -spike2sdf diff --git a/upstream/src/Common.mk b/upstream/src/Common.mk new file mode 100644 index 0000000..e0287d8 --- /dev/null +++ b/upstream/src/Common.mk @@ -0,0 +1,10 @@ +%.hh.gch: %.hh +# for some reason $(CXXCOMPILE) is just... "c", whereas when seen in +# any sub/Makefile.am, it does the trick alright, so spell it out in full + $(CXX) $(AM_CXXFLAGS) -c $< + +AM_CXXFLAGS := -Wall -std=c++0x -fno-rtti \ + -I$(top_srcdir) -I$(top_srcdir)/src \ + $(LIBCN_CFLAGS) $(OPENMP_CXXFLAGS) \ + -DHAVE_CONFIG_H \ + -DBUILT_BY=\"@user@\" diff --git a/upstream/src/Makefile.am b/upstream/src/Makefile.am index 55fb135..d09bdcd 100644 --- a/upstream/src/Makefile.am +++ b/upstream/src/Makefile.am @@ -1,37 +1,18 @@ -SUBDIRS = libstilton libcn +include $(top_srcdir)/src/Common.mk + +SUBDIRS = . libstilton libcn cnrun if DO_TOOLS SUBDIRS += tools endif -git_describe_tags := `git describe --tags` - +libicing_a_CXXFLAGS := \ + $(AM_CXXFLAGS) -DGIT_DESCRIBE_TAGS=\"$(shell git describe --tags)\" -AM_CXXFLAGS := -Wall -std=c++0x -fno-rtti \ - -I$(top_srcdir)/src \ - $(LIBCN_CFLAGS) \ - -DBUILT_BY=\"@user@\" \ - -DGIT_DESCRIBE_TAGS=\"$(git_describe_tags)\" +noinst_LIBRARIES := \ + libicing.a -bin_PROGRAMS = \ - cnrun -cnrun_SOURCES = \ - print_version.cc \ - runner-main.cc runner-interpreter.cc runner-interpreter-completions.cc runner.hh -cnrun_LDADD = \ - libcn/libcn.la \ - libstilton/libstilton.la \ - $(LIBCN_LIBS) -cnrun_LDFLAAGS = \ - -shared +libicing_a_SOURCES := \ + print_version.cc print_version.o: FORCE FORCE: - -CLEANFILES = \ - */*.la lib*/*.hh.gch - -install-exec-hook: - rm -f $(DESTDIR)/$(pkglibdir)/*.la -uninstall-hook: - rm -f $(DESTDIR)/$(pkglibdir)/*.so - diff --git a/upstream/src/cnrun/.gitignore b/upstream/src/cnrun/.gitignore new file mode 100644 index 0000000..32044ab --- /dev/null +++ b/upstream/src/cnrun/.gitignore @@ -0,0 +1 @@ +cnrun diff --git a/upstream/src/cnrun/Makefile.am b/upstream/src/cnrun/Makefile.am new file mode 100644 index 0000000..7916d33 --- /dev/null +++ b/upstream/src/cnrun/Makefile.am @@ -0,0 +1,20 @@ +include $(top_srcdir)/src/Common.mk + +if DO_PCH +BUILT_SOURCES = \ + runner.hh.gch + +CLEANFILES = $(BUILT_SOURCES) +endif + +bin_PROGRAMS = \ + cnrun +cnrun_SOURCES = \ + runner-main.cc runner-interpreter.cc runner-interpreter-completions.cc runner.hh +cnrun_LDADD = \ + $(top_srcdir)/src/libicing.a \ + $(top_srcdir)/src/libcn/libcn.la \ + $(top_srcdir)/src/libstilton/libstilton.la \ + $(LIBCN_LIBS) +cnrun_LDFLAAGS = \ + -shared diff --git a/upstream/src/runner-interpreter-completions.cc b/upstream/src/cnrun/runner-interpreter-completions.cc similarity index 99% rename from upstream/src/runner-interpreter-completions.cc rename to upstream/src/cnrun/runner-interpreter-completions.cc index ffb6c0d..72a4e9b 100644 --- a/upstream/src/runner-interpreter-completions.cc +++ b/upstream/src/cnrun/runner-interpreter-completions.cc @@ -31,6 +31,10 @@ #include "runner.hh" #include "libcn/model.hh" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif + using namespace std; using namespace Stilton; diff --git a/upstream/src/runner-interpreter.cc b/upstream/src/cnrun/runner-interpreter.cc similarity index 99% rename from upstream/src/runner-interpreter.cc rename to upstream/src/cnrun/runner-interpreter.cc index 610cac7..3521279 100644 --- a/upstream/src/runner-interpreter.cc +++ b/upstream/src/cnrun/runner-interpreter.cc @@ -36,6 +36,10 @@ #include "libcn/integrate-rk65.hh" #include "libcn/base-unit.hh" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif + using namespace std; diff --git a/upstream/src/runner-main.cc b/upstream/src/cnrun/runner-main.cc similarity index 98% rename from upstream/src/runner-main.cc rename to upstream/src/cnrun/runner-main.cc index 4044521..20fb705 100644 --- a/upstream/src/runner-main.cc +++ b/upstream/src/cnrun/runner-main.cc @@ -15,7 +15,10 @@ #include "libstilton/exprparser.hh" #include "runner.hh" -#include "config.h" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif + using namespace std; using namespace Stilton; diff --git a/upstream/src/runner.hh b/upstream/src/cnrun/runner.hh similarity index 97% rename from upstream/src/runner.hh rename to upstream/src/cnrun/runner.hh index 65909d8..6fcaef6 100644 --- a/upstream/src/runner.hh +++ b/upstream/src/cnrun/runner.hh @@ -21,6 +21,10 @@ #include "libcn/model.hh" #include "libcn/sources.hh" +#if HAVE_CONFIG_H && !defined(VERSION) +# include "config.h" +#endif + using namespace CNRun; using namespace Stilton; diff --git a/upstream/src/libcn/Makefile.am b/upstream/src/libcn/Makefile.am index 4321325..7679188 100644 --- a/upstream/src/libcn/Makefile.am +++ b/upstream/src/libcn/Makefile.am @@ -1,6 +1,4 @@ -AM_CXXFLAGS = -Wall -fno-rtti -shared -std=c++0x \ - $(LIBCN_CFLAGS) $(OPENMP_CXXFLAGS) \ - -I$(top_srcdir)/src +include $(top_srcdir)/src/Common.mk pkglib_LTLIBRARIES = libcn.la @@ -42,25 +40,6 @@ BUILT_SOURCES = \ base-neuron.hh.gch standalone-synapses.hh.gch hosted-synapses.hh.gch \ model.hh.gch \ integrate-base.hh.gch integrate-rk65.hh.gch -%.hh.gch: %.hh - $(CXXCOMPILE) -c $< -endif - -install-data-hook: - rm -f $(DESTDIR)$(pkglibdir)/*.la; - -# libcnincdir = $(includedir)/libcn -# libcninc_HEADERS = \ -# sources.hh \ -# types.hh \ -# param-unit-literals.hh \ -# mx-attr.hh \ -# base-unit.hh standalone-attr.hh hosted-attr.hh \ -# base-synapse.hh standalone-neurons.hh hosted-neurons.hh \ -# base-neuron.hh standalone-synapses.hh hosted-synapses.hh \ -# model.hh \ -# integrate-base.hh integrate-rk65.hh - -# install-exec-hook: -# $(mkinstalldirs) $(DESTDIR)$(libcnincdir) +CLEANFILES = $(BUILT_SOURCES) +endif diff --git a/upstream/src/libstilton/Makefile.am b/upstream/src/libstilton/Makefile.am index afe5e9c..9bff333 100644 --- a/upstream/src/libstilton/Makefile.am +++ b/upstream/src/libstilton/Makefile.am @@ -1,8 +1,7 @@ -AM_CXXFLAGS = -Wall -fno-rtti -shared -std=c++0x \ - $(LIBCN_CFLAGS) \ - -I$(top_srcdir)/src +include $(top_srcdir)/src/Common.mk -pkglib_LTLIBRARIES = libstilton.la +pkglib_LTLIBRARIES = \ + libstilton.la libstilton_la_SOURCES = \ exprparser.hh \ @@ -20,7 +19,10 @@ libstilton_la_LDFLAGS = \ if DO_PCH BUILT_SOURCES = \ - exprparser.hh.gch pointaligned-s.hh.gch gcc-builtins.hh.gch log-facility.hh.gch -%.hh.gch: %.hh - $(CXXCOMPILE) -c $< + exprparser.hh.gch \ + pointaligned-s.hh.gch \ + gcc-builtins.hh.gch \ + log-facility.hh.gch + +CLEANFILES = $(BUILT_SOURCES) endif diff --git a/upstream/src/tools/Makefile.am b/upstream/src/tools/Makefile.am index 074bad5..d866f51 100644 --- a/upstream/src/tools/Makefile.am +++ b/upstream/src/tools/Makefile.am @@ -1,11 +1,11 @@ +include $(top_srcdir)/src/Common.mk + +AM_CXXFLAGS += \ + $(LIBCN_CFLAGS) + bin_PROGRAMS = \ spike2sdf varfold hh-latency-estimator -AM_CXXFLAGS = -Wall -std=c++0x -fno-rtti \ - -I$(top_srcdir)/src \ - $(LIBCN_CFLAGS) \ - -DBUILT_BY=\"@user@\" - spike2sdf_SOURCES = \ spike2sdf.cc -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/cnrun.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
