[med-svn] [aghermann] 23/60: demultiply src/aghermann/**/Makefile.am
andrei zavada
hmmr-guest at alioth.debian.org
Mon Nov 4 23:49:55 UTC 2013
This is an automated email from the git hooks/post-receive script.
hmmr-guest pushed a commit to branch WIP
in repository aghermann.
commit 6a51a8bcc72c55c0504d4b698ed4cf5acbe6759b
Author: Andrei Zavada <johnhommer at gmail.com>
Date: Sun Oct 13 23:55:35 2013 +0300
demultiply src/aghermann/**/Makefile.am
---
upstream/configure.ac | 10 --
upstream/src/aghermann/Makefile.am | 133 ++++++++++++++++++++++----
upstream/src/aghermann/expdesign/Makefile.am | 21 ----
upstream/src/aghermann/ica/Makefile.am | 2 -
upstream/src/aghermann/model/Makefile.am | 16 ----
upstream/src/aghermann/patterns/Makefile.am | 13 ---
upstream/src/aghermann/rk1968/Makefile.am | 11 ---
upstream/src/aghermann/ui/Makefile.am | 23 -----
upstream/src/aghermann/ui/mf/Makefile.am | 15 ---
upstream/src/aghermann/ui/mw/Makefile.am | 27 ------
upstream/src/aghermann/ui/sf/Makefile.am | 54 -----------
upstream/src/aghermann/ui/sm/Makefile.am | 18 ----
upstream/src/aghermann/ui/sm/sm-construct.cc | 4 +
upstream/src/tools/Makefile.am | 2 +-
14 files changed, 121 insertions(+), 228 deletions(-)
diff --git a/upstream/configure.ac b/upstream/configure.ac
index 5967b1d..8ee68fc 100644
--- a/upstream/configure.ac
+++ b/upstream/configure.ac
@@ -197,16 +197,6 @@ AC_OUTPUT([
src/libmetrics/Makefile
src/aghermann/Makefile
- src/aghermann/patterns/Makefile
- src/aghermann/ica/Makefile
- src/aghermann/expdesign/Makefile
- src/aghermann/rk1968/Makefile
- src/aghermann/model/Makefile
- src/aghermann/ui/Makefile
- src/aghermann/ui/sm/Makefile
- src/aghermann/ui/mw/Makefile
- src/aghermann/ui/sf/Makefile
- src/aghermann/ui/mf/Makefile
src/tools/Makefile
diff --git a/upstream/src/aghermann/Makefile.am b/upstream/src/aghermann/Makefile.am
index 8f8575e..e68d3a7 100644
--- a/upstream/src/aghermann/Makefile.am
+++ b/upstream/src/aghermann/Makefile.am
@@ -1,19 +1,127 @@
-SUBDIRS := \
- expdesign \
- patterns \
- rk1968 model ica \
- ui
-
AM_CXXFLAGS := \
- -Wall -std=c++0x -fno-rtti \
- $(GTK_CFLAGS) $(UNIQUE_CFLAGS) \
+ -Wall -Wdeprecated-declarations -std=c++0x -fno-rtti \
+ $(GTK_CFLAGS) $(VTE_CFLAGS) $(CAIRO_CFLAGS) $(LIBCONFIGXX_CFLAGS) $(UNIQUE_CFLAGS) \
$(OPENMP_CXXFLAGS) \
-I$(top_srcdir)/src \
+ -DPACKAGE_DATADIR=\"$(datadir)\" \
-DBUILT_BY=\"@user@\"
bin_PROGRAMS := aghermann
aghermann_SOURCES := \
+ expdesign/forward-decls.hh \
+ expdesign/dirlevel.cc \
+ expdesign/dirlevel.hh \
+ expdesign/expdesign.hh \
+ expdesign/profile.hh \
+ expdesign/expdesign.cc \
+ expdesign/loadsave.cc \
+ expdesign/recording.cc \
+ expdesign/recording.hh \
+ expdesign/subject.cc \
+ expdesign/subject.hh \
+ expdesign/tree-scanner.cc \
+ ica/forward-decls.hh \
+ ica/ica.hh \
+ model/achermann-tunable.cc \
+ model/achermann-tunable.hh \
+ model/achermann.cc \
+ model/achermann.hh \
+ model/achermann-siman.cc \
+ model/ultradian-cycle.cc \
+ model/borbely.cc \
+ model/beersma.hh \
+ model/forward-decls.hh \
+ patterns/forward-decls.hh \
+ patterns/patterns.cc \
+ patterns/patterns.hh \
+ patterns/patterns.ii \
+ rk1968/rk1968.cc \
+ rk1968/rk1968.hh \
+ rk1968/rk1968-profiles.cc \
+ ui/sm/sm-construct.cc \
+ ui/sm/sm.cc \
+ ui/sm/sm.hh \
+ ui/sm/sm_cb.cc \
+ ui/sm/sm_cb.hh \
+ ui/mw/admit-one.cc \
+ ui/mw/admit-one_cb.cc \
+ ui/mw/construct.cc \
+ ui/mw/loadsave.cc \
+ ui/mw/mainmenu_cb.cc \
+ ui/mw/measurements.cc \
+ ui/mw/measurements_cb.cc \
+ ui/mw/populate.cc \
+ ui/mw/settings_cb.cc \
+ ui/mw/simulations.cc \
+ ui/mw/simulations_cb.cc \
+ ui/mw/splash.cc \
+ ui/mw/widgets.hh \
+ ui/mw/mw.cc \
+ ui/mw/mw.hh \
+ ui/mw/mw_cb.cc \
+ ui/mw/mw_cb.hh \
+ ui/sf/channel.cc \
+ ui/sf/channel.hh \
+ ui/sf/construct.cc \
+ ui/sf/controls_cb.cc \
+ ui/sf/hypnogram.cc \
+ ui/sf/hypnogram_cb.cc \
+ ui/sf/ica.cc \
+ ui/sf/ica_cb.cc \
+ ui/sf/mainmenu_cb.cc \
+ ui/sf/montage-overlays.cc \
+ ui/sf/montage.cc \
+ ui/sf/montage_cb.cc \
+ ui/sf/montage-menus_cb.cc \
+ ui/sf/sf.cc \
+ ui/sf/sf.hh \
+ ui/sf/sf_cb.cc \
+ ui/sf/sf_cb.hh \
+ ui/sf/widgets.hh \
+ ui/sf/d/artifacts.hh \
+ ui/sf/d/artifacts.cc \
+ ui/sf/d/artifacts-profiles_cb.cc \
+ ui/sf/d/artifacts_cb.cc \
+ ui/sf/d/artifacts-simple.hh \
+ ui/sf/d/artifacts-simple.cc \
+ ui/sf/d/artifacts-simple-construct.cc \
+ ui/sf/d/filters.hh \
+ ui/sf/d/filters.cc \
+ ui/sf/d/filters-construct.cc \
+ ui/sf/d/filters_cb.cc \
+ ui/sf/d/patterns.hh \
+ ui/sf/d/patterns.cc \
+ ui/sf/d/patterns-draw.cc \
+ ui/sf/d/patterns-profiles.cc \
+ ui/sf/d/patterns_cb.cc \
+ ui/sf/d/patterns-profiles_cb.cc \
+ ui/sf/d/phasediff.hh \
+ ui/sf/d/phasediff.cc \
+ ui/sf/d/phasediff-construct.cc \
+ ui/sf/d/phasediff_cb.cc \
+ ui/sf/d/rk1968.hh \
+ ui/sf/d/rk1968.cc \
+ ui/sf/d/rk1968-profiles.cc \
+ ui/sf/d/rk1968-profiles_cb.cc \
+ ui/sf/d/rk1968_cb.cc \
+ ui/mf/construct.cc \
+ ui/mf/mf.cc \
+ ui/mf/mf.hh \
+ ui/mf/mf_cb.cc \
+ ui/mf/mf_cb.hh \
+ ui/forward-decls.hh \
+ ui/dirlevel-storable-adapter.hh \
+ ui/dirlevel-storable-adapter.ii \
+ ui/globals.cc \
+ ui/globals.hh \
+ ui/misc.cc \
+ ui/misc.hh \
+ ui/ui++.cc \
+ ui/ui++.hh \
+ ui/ui.cc \
+ ui/ui.hh \
+ ui/ui-itpp.hh \
print_version.cc \
main.cc \
globals.cc \
@@ -23,18 +131,9 @@ print_version.o: FORCE
FORCE:
aghermann_LDADD := \
- ui/sm/liba.a \
- ui/mw/liba.a \
- ui/sf/liba.a \
- ui/mf/liba.a \
- ui/liba.a \
- model/liba.a \
- rk1968/liba.a \
- patterns/liba.a \
../libmetrics/libmetrics.la \
../libsigproc/libsigproc.la \
../common/liba.a \
- expdesign/liba.a \
../libsigfile/libsigfile.la \
$(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GSL_LIBS) \
$(GTK_LIBS) $(CAIRO_LIBS) $(UNIQUE_LIBS) $(VTE_LIBS) \
diff --git a/upstream/src/aghermann/expdesign/Makefile.am b/upstream/src/aghermann/expdesign/Makefile.am
deleted file mode 100644
index e42cc71..0000000
--- a/upstream/src/aghermann/expdesign/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-AM_CXXFLAGS := \
- -Wall -std=c++0x -fno-rtti \
- $(OPENMP_CXXFLAGS) \
- -I$(top_srcdir)/src \
- -DPACKAGE_DATADIR=\"$(datadir)\"
-
-noinst_LIBRARIES := liba.a
-
-liba_a_SOURCES := \
- forward-decls.hh \
- dirlevel.cc \
- dirlevel.hh \
- expdesign.hh \
- profile.hh \
- expdesign.cc \
- loadsave.cc \
- recording.cc \
- recording.hh \
- subject.cc \
- subject.hh \
- tree-scanner.cc
diff --git a/upstream/src/aghermann/ica/Makefile.am b/upstream/src/aghermann/ica/Makefile.am
index ae814a6..aaadedb 100644
--- a/upstream/src/aghermann/ica/Makefile.am
+++ b/upstream/src/aghermann/ica/Makefile.am
@@ -3,5 +3,3 @@ AM_CXXFLAGS := \
-I$(top_srcdir)/src
EXTRA_DIST := \
- forward-decls.hh \
- ica.hh
diff --git a/upstream/src/aghermann/model/Makefile.am b/upstream/src/aghermann/model/Makefile.am
deleted file mode 100644
index 27b443e..0000000
--- a/upstream/src/aghermann/model/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-AM_CXXFLAGS := \
- -Wall -std=c++0x -fno-rtti \
- -I$(top_srcdir)/src
-
-noinst_LIBRARIES := liba.a
-
-liba_a_SOURCES := \
- achermann-tunable.cc \
- achermann-tunable.hh \
- achermann.cc \
- achermann.hh \
- achermann-siman.cc \
- ultradian-cycle.cc \
- borbely.cc \
- beersma.hh \
- forward-decls.hh
diff --git a/upstream/src/aghermann/patterns/Makefile.am b/upstream/src/aghermann/patterns/Makefile.am
deleted file mode 100644
index 22d58c0..0000000
--- a/upstream/src/aghermann/patterns/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-AM_CXXFLAGS := \
- -Wall -std=c++0x -fno-rtti \
- -I$(top_srcdir)/src \
- -DPACKAGE_DATADIR=\"$(datadir)\"
-
-noinst_LIBRARIES := liba.a
-
-liba_a_SOURCES := \
- forward-decls.hh \
- patterns.cc patterns.hh patterns.ii
-
-# EXTRA_DIST := \
-# patterns.ii
diff --git a/upstream/src/aghermann/rk1968/Makefile.am b/upstream/src/aghermann/rk1968/Makefile.am
deleted file mode 100644
index 233fffa..0000000
--- a/upstream/src/aghermann/rk1968/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-AM_CXXFLAGS := \
- -Wall -std=c++0x -fno-rtti \
- -I$(top_srcdir)/src \
- -DPACKAGE_DATADIR=\"$(datadir)\"
-
-noinst_LIBRARIES := liba.a
-
-liba_a_SOURCES := \
- rk1968-profiles.cc \
- rk1968.cc \
- rk1968.hh
diff --git a/upstream/src/aghermann/ui/Makefile.am b/upstream/src/aghermann/ui/Makefile.am
deleted file mode 100644
index 195bded..0000000
--- a/upstream/src/aghermann/ui/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-SUBDIRS := sm mw sf mf
-AM_CXXFLAGS := \
- -std=c++0x -fno-rtti -Wdeprecated-declarations \
- $(GTK_CFLAGS) $(UNIQUE_CFLAGS) \
- -DPACKAGE_DATADIR=\"$(datadir)\" \
- $(OPENMP_CXXFLAGS) \
- -I$(top_srcdir)/src
-
-noinst_LIBRARIES := liba.a
-
-liba_a_SOURCES := \
- forward-decls.hh \
- dirlevel-storable-adapter.hh \
- dirlevel-storable-adapter.ii \
- globals.cc \
- globals.hh \
- misc.cc \
- misc.hh \
- ui++.cc \
- ui++.hh \
- ui.cc \
- ui.hh \
- ui-itpp.hh
diff --git a/upstream/src/aghermann/ui/mf/Makefile.am b/upstream/src/aghermann/ui/mf/Makefile.am
deleted file mode 100644
index 6135a64..0000000
--- a/upstream/src/aghermann/ui/mf/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-AM_CXXFLAGS := \
- -std=c++0x -fno-rtti -Wdeprecated-declarations -Wall \
- $(GTK_CFLAGS) $(LIBCONFIGXX_CFLAGS) $(UNIQUE_CFLAGS) \
- -DPACKAGE_DATADIR=\"$(datadir)\" \
- $(OPENMP_CXXFLAGS) \
- -I$(top_srcdir)/src
-
-noinst_LIBRARIES := liba.a
-
-liba_a_SOURCES := \
- construct.cc \
- mf.cc \
- mf.hh \
- mf_cb.cc \
- mf_cb.hh
diff --git a/upstream/src/aghermann/ui/mw/Makefile.am b/upstream/src/aghermann/ui/mw/Makefile.am
deleted file mode 100644
index 4a5bd8c..0000000
--- a/upstream/src/aghermann/ui/mw/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-AM_CXXFLAGS = \
- -std=c++0x -fno-rtti -Wdeprecated-declarations -Wall \
- $(GTK_CFLAGS) $(VTE_CFLAGS) $(CAIRO_CFLAGS) $(UNIQUE_CFLAGS) $(LIBCONFIGXX_CFLAGS) \
- -DPACKAGE_DATADIR=\"$(datadir)\" \
- $(OPENMP_CXXFLAGS) \
- -I$(top_srcdir)/src
-
-noinst_LIBRARIES = liba.a
-
-liba_a_SOURCES = \
- admit-one.cc \
- admit-one_cb.cc \
- construct.cc \
- loadsave.cc \
- mainmenu_cb.cc \
- measurements.cc \
- measurements_cb.cc \
- populate.cc \
- settings_cb.cc \
- simulations.cc \
- simulations_cb.cc \
- splash.cc \
- widgets.hh \
- mw.cc \
- mw.hh \
- mw_cb.cc \
- mw_cb.hh
diff --git a/upstream/src/aghermann/ui/sf/Makefile.am b/upstream/src/aghermann/ui/sf/Makefile.am
deleted file mode 100644
index 9b90deb..0000000
--- a/upstream/src/aghermann/ui/sf/Makefile.am
+++ /dev/null
@@ -1,54 +0,0 @@
-AM_CXXFLAGS := \
- -std=c++0x -fno-rtti -Wdeprecated-declarations -Wall \
- $(GTK_CFLAGS) $(UNIQUE_CFLAGS) $(CAIRO_CFLAGS) $(LIBCONFIGXX_CFLAGS) \
- -DPACKAGE_DATADIR=\"$(datadir)\" \
- $(OPENMP_CXXFLAGS) \
- -I$(top_srcdir)/src
-
-noinst_LIBRARIES := liba.a
-
-liba_a_SOURCES := \
- channel.cc \
- channel.hh \
- construct.cc \
- controls_cb.cc \
- hypnogram.cc \
- hypnogram_cb.cc \
- ica.cc \
- ica_cb.cc \
- mainmenu_cb.cc \
- montage-overlays.cc \
- montage.cc \
- montage_cb.cc \
- montage-menus_cb.cc \
- sf.cc \
- sf.hh \
- sf_cb.cc \
- sf_cb.hh \
- widgets.hh \
- d/artifacts.hh \
- d/artifacts.cc \
- d/artifacts-profiles_cb.cc \
- d/artifacts_cb.cc \
- d/artifacts-simple.hh \
- d/artifacts-simple.cc \
- d/artifacts-simple-construct.cc \
- d/filters.hh \
- d/filters.cc \
- d/filters-construct.cc \
- d/filters_cb.cc \
- d/patterns.hh \
- d/patterns.cc \
- d/patterns-draw.cc \
- d/patterns-profiles.cc \
- d/patterns_cb.cc \
- d/patterns-profiles_cb.cc \
- d/phasediff.hh \
- d/phasediff.cc \
- d/phasediff-construct.cc \
- d/phasediff_cb.cc \
- d/rk1968.hh \
- d/rk1968.cc \
- d/rk1968-profiles.cc \
- d/rk1968-profiles_cb.cc \
- d/rk1968_cb.cc
diff --git a/upstream/src/aghermann/ui/sm/Makefile.am b/upstream/src/aghermann/ui/sm/Makefile.am
deleted file mode 100644
index 3f31317..0000000
--- a/upstream/src/aghermann/ui/sm/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-AM_CXXFLAGS := \
- -std=c++0x -fno-rtti -Wdeprecated-declarations -Wall \
- $(GTK_CFLAGS) $(UNIQUE_CFLAGS) \
- -DPACKAGE_DATADIR=\"$(datadir)\" \
- $(OPENMP_CXXFLAGS) \
- -I$(top_srcdir)/src
-
-noinst_LIBRARIES := liba.a
-
-liba_a_SOURCES := \
- sm-construct.cc \
- sm.cc \
- sm.hh \
- sm_cb.cc \
- sm_cb.hh
-
-CLEANFILES := \
- liba.la
diff --git a/upstream/src/aghermann/ui/sm/sm-construct.cc b/upstream/src/aghermann/ui/sm/sm-construct.cc
index 5ab29b7..c863bcb 100644
--- a/upstream/src/aghermann/ui/sm/sm-construct.cc
+++ b/upstream/src/aghermann/ui/sm/sm-construct.cc
@@ -16,6 +16,10 @@
#include "sm.hh"
#include "sm_cb.hh"
+#if HAVE_CONFIG_H && !defined(VERSION)
+# include "config.h"
+#endif
+
using namespace std;
using namespace agh::ui;
diff --git a/upstream/src/tools/Makefile.am b/upstream/src/tools/Makefile.am
index 20abea4..f54cfb7 100644
--- a/upstream/src/tools/Makefile.am
+++ b/upstream/src/tools/Makefile.am
@@ -28,6 +28,7 @@ edfhed_LDADD := \
$(OPENMP_LDADD) $(LIBFFTW3_LDADD)
edfhed_gtk_SOURCES := \
+ ../aghermann/ui/ui.cc \
edfhed-gtk.cc
edfhed_gtk_CXXFLAGS := \
$(AM_CXXFLAGS) $(UNIQUE_CFLAGS) $(GTK_CFLAGS) -DPACKAGE_DATADIR=\"$(datadir)\"
@@ -35,7 +36,6 @@ edfhed_gtk_LDADD := \
../libsigfile/libsigfile.la \
../common/liba.a \
../libsigproc/libsigproc.la \
- ../aghermann/ui/liba.a \
$(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GSL_LIBS) \
$(GTK_LIBS) \
$(OPENMP_LDADD) $(LIBFFTW3_LDADD)
--
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git
More information about the debian-med-commit
mailing list