This is an automated email from the git hooks/post-receive script. hmmr-guest pushed a commit to branch WIP in repository cnrun.
commit e43dda6a7ca274565fc9f987f413c70cf03496ba Author: Andrei Zavada <[email protected]> Date: Sat Mar 22 13:35:17 2014 +0200 move tools into own dir under src/ --- upstream/configure.ac | 3 ++- upstream/src/Makefile.am | 26 ++++-------------------- upstream/src/tools/.gitignore | 3 +++ upstream/src/tools/Makefile.am | 26 ++++++++++++++++++++++++ upstream/src/{ => tools}/hh-latency-estimator.cc | 0 upstream/src/{ => tools}/spike2sdf.cc | 0 upstream/src/{ => tools}/varfold.cc | 0 7 files changed, 35 insertions(+), 23 deletions(-) diff --git a/upstream/configure.ac b/upstream/configure.ac index a8519cc..f37a665 100644 --- a/upstream/configure.ac +++ b/upstream/configure.ac @@ -83,6 +83,7 @@ AC_SUBST(build_date, [`date +"%F"`]) AC_SUBST(build_datetime, [`date`]) AC_SUBST(docdir, [${prefix}/share/doc/${PACKAGE_TARNAME}]) + AC_OUTPUT([ Makefile src/Makefile @@ -93,7 +94,7 @@ AC_OUTPUT([ man/spike2sdf.1 man/varfold.1 man/hh-latency-estimator.1 - ]) + src/tools/Makefile]) AC_MSG_RESULT([ ** Configuration summary for $PACKAGE $VERSION: diff --git a/upstream/src/Makefile.am b/upstream/src/Makefile.am index d206f3e..9b52409 100644 --- a/upstream/src/Makefile.am +++ b/upstream/src/Makefile.am @@ -1,6 +1,10 @@ SUBDIRS = libstilton libcn +if DO_TOOLS +SUBDIRS += tools +endif AM_CXXFLAGS = -Wall -std=c++0x -fno-rtti \ + -I$(top_srcdir)/src \ $(LIBCN_CFLAGS) \ -DBUILT_BY=\"@user@\" @@ -15,28 +19,6 @@ cnrun_LDADD = \ cnrun_LDFLAAGS = \ -shared -if DO_TOOLS -bin_PROGRAMS += \ - spike2sdf varfold hh-latency-estimator - -spike2sdf_SOURCES = \ - spike2sdf.cc - -varfold_SOURCES = \ - varfold.cc -varfold_LDFLAAGS = \ - -shared -varfold_LDADD = \ - $(LIBCN_LIBS) - -hh_latency_estimator_SOURCES = \ - hh-latency-estimator.cc -hh_latency_estimator_LDADD = \ - ${cnrun_LDADD} -hh_latency_estimator_LDFLAAGS = \ - -shared -endif - CLEANFILES = \ */*.la lib*/*.hh.gch diff --git a/upstream/src/tools/.gitignore b/upstream/src/tools/.gitignore new file mode 100644 index 0000000..a3ee24b --- /dev/null +++ b/upstream/src/tools/.gitignore @@ -0,0 +1,3 @@ +varfold +hh-latency-estimator +spike2sdf diff --git a/upstream/src/tools/Makefile.am b/upstream/src/tools/Makefile.am new file mode 100644 index 0000000..074bad5 --- /dev/null +++ b/upstream/src/tools/Makefile.am @@ -0,0 +1,26 @@ +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 + +varfold_SOURCES = \ + varfold.cc +varfold_LDFLAAGS = \ + -shared +varfold_LDADD = \ + $(LIBCN_LIBS) + +hh_latency_estimator_SOURCES = \ + hh-latency-estimator.cc +hh_latency_estimator_LDADD = \ + ../libcn/libcn.la \ + ../libstilton/libstilton.la \ + $(LIBCN_LIBS) +hh_latency_estimator_LDFLAAGS = \ + -shared diff --git a/upstream/src/hh-latency-estimator.cc b/upstream/src/tools/hh-latency-estimator.cc similarity index 100% rename from upstream/src/hh-latency-estimator.cc rename to upstream/src/tools/hh-latency-estimator.cc diff --git a/upstream/src/spike2sdf.cc b/upstream/src/tools/spike2sdf.cc similarity index 100% rename from upstream/src/spike2sdf.cc rename to upstream/src/tools/spike2sdf.cc diff --git a/upstream/src/varfold.cc b/upstream/src/tools/varfold.cc similarity index 100% rename from upstream/src/varfold.cc rename to upstream/src/tools/varfold.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
