[med-svn] [SCM] aghermann branch, master, updated. 99b1d5a023eee9df74b0e0d6f894516fc79435ad
Andrei Zavada
johnhommer at gmail.com
Sun Jul 7 23:03:58 UTC 2013
The following commit has been merged in the master branch:
commit 00bc34a8c731d09e18d220fd8ea44b06842887f9
Author: Andrei Zavada <johnhommer at gmail.com>
Date: Tue Jun 18 22:06:00 2013 +0300
move aghermann/metrics to libmetrics, too
diff --git a/configure.ac b/configure.ac
index 8b38781..04ac619 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,10 +194,10 @@ AC_OUTPUT([
src/common/Makefile
src/libsigproc/Makefile
src/libsigfile/Makefile
+ src/libmetrics/Makefile
src/aghermann/Makefile
src/aghermann/patterns/Makefile
- src/aghermann/metrics/Makefile
src/aghermann/ica/Makefile
src/aghermann/expdesign/Makefile
src/aghermann/rk1968/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 4e7cc8d..8ba6c61 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,5 @@
SUBDIRS := \
- common libsigproc libsigfile \
+ common \
+ libsigproc libsigfile libmetrics \
aghermann \
tools
diff --git a/src/aghermann/Makefile.am b/src/aghermann/Makefile.am
index 9d3491c..3f2911c 100644
--- a/src/aghermann/Makefile.am
+++ b/src/aghermann/Makefile.am
@@ -1,6 +1,5 @@
SUBDIRS := \
ica \
- metrics \
expdesign \
patterns \
rk1968 model \
@@ -34,7 +33,7 @@ aghermann_LDADD := \
model/liba.a \
rk1968/liba.a \
patterns/liba.a \
- metrics/liba.a \
+ ../libmetrics/libmetrics.la \
../libsigproc/libsigproc.la \
../common/liba.a \
expdesign/liba.a \
diff --git a/src/aghermann/expdesign/forward-decls.hh b/src/aghermann/expdesign/forward-decls.hh
index c5a8a96..daa9f05 100644
--- a/src/aghermann/expdesign/forward-decls.hh
+++ b/src/aghermann/expdesign/forward-decls.hh
@@ -10,8 +10,8 @@
*/
-#ifndef _AGH_EXPDESIGN_FORWARD_DECLS_H
-#define _AGH_EXPDESIGN_FORWARD_DECLS_H
+#ifndef AGH_AGHERMANN_EXPDESIGN_FORWARD_DECLS_H_
+#define AGH_AGHERMANN_EXPDESIGN_FORWARD_DECLS_H_
namespace agh {
@@ -25,8 +25,7 @@ class CProfile;
} // namespace agh
-
-#endif
+#endif // AGH_AGHERMANN_EXPDESIGN_FORWARD_DECLS_H_
// Local Variables:
// Mode: c++
diff --git a/src/aghermann/expdesign/primaries.hh b/src/aghermann/expdesign/primaries.hh
index 0ee5989..8612054 100644
--- a/src/aghermann/expdesign/primaries.hh
+++ b/src/aghermann/expdesign/primaries.hh
@@ -10,8 +10,8 @@
*/
-#ifndef _AGH_EXPDESIGN_PRIMARIES_H
-#define _AGH_EXPDESIGN_PRIMARIES_H
+#ifndef AGH_AGHERMANN_EXPDESIGN_PRIMARIES_H_
+#define AGH_AGHERMANN_EXPDESIGN_PRIMARIES_H_
#include <cstring>
@@ -25,7 +25,7 @@
#include "common/config-validate.hh"
#include "common/subject_id.hh"
#include "libsigproc/winfun.hh"
-#include "aghermann/metrics/bands.hh"
+#include "libmetrics/bands.hh"
#include "aghermann/model/achermann.hh"
#include "recording.hh"
@@ -557,7 +557,7 @@ const char* CExpDesign::group_of( const T& jid)
} // namespace agh
-#endif
+#endif // AGH_AGHERMANN_EXPDESIGN_PRIMARIES_H_
// Local Variables:
// Mode: c++
diff --git a/src/aghermann/expdesign/profile.hh b/src/aghermann/expdesign/profile.hh
index 89d08cf..cef044c 100644
--- a/src/aghermann/expdesign/profile.hh
+++ b/src/aghermann/expdesign/profile.hh
@@ -10,8 +10,8 @@
*/
-#ifndef _AGH_EXPDESIGN_PROFILE_H
-#define _AGH_EXPDESIGN_PROFILE_H
+#ifndef AGH_AGHERMANN_EXPDESIGN_PROFILE_H_
+#define AGH_AGHERMANN_EXPDESIGN_PROFILE_H_
#include "recording.hh"
@@ -168,7 +168,7 @@ CProfile::nth_episode_end_page( size_t n) const
} // namespace agh
-#endif
+#endif // AGH_AGHERMANN_EXPDESIGN_PROFILE_H_
// Local Variables:
// Mode: c++
diff --git a/src/aghermann/expdesign/recording.hh b/src/aghermann/expdesign/recording.hh
index bc5a839..861e167 100644
--- a/src/aghermann/expdesign/recording.hh
+++ b/src/aghermann/expdesign/recording.hh
@@ -10,13 +10,13 @@
*/
-#ifndef _AGH_EXPDESIGN_RECORDING_H
-#define _AGH_EXPDESIGN_RECORDING_H
+#ifndef AGH_AGHERMANN_EXPDESIGN_RECORDING_H_
+#define AGH_AGHERMANN_EXPDESIGN_RECORDING_H_
#include <cstdarg>
#include "libsigfile/source.hh"
-#include "aghermann/metrics/all.hh"
+#include "libmetrics/all.hh"
#include "aghermann/model/forward-decls.hh"
#include "forward-decls.hh"
@@ -305,7 +305,7 @@ course( const SProfileParamSet::MC& p)
} // namespace agh
-#endif
+#endif // AGH_AGHERMANN_EXPDESIGN_RECORDING_H_
// Local Variables:
// Mode: c++
diff --git a/src/aghermann/globals.hh b/src/aghermann/globals.hh
index 6115f3a..266806c 100644
--- a/src/aghermann/globals.hh
+++ b/src/aghermann/globals.hh
@@ -9,8 +9,8 @@
* License: GPL
*/
-#ifndef _AGH_GLOBALS_H
-#define _AGH_GLOBALS_H
+#ifndef AGH_AGHERMANN_GLOBALS_H_
+#define AGH_AGHERMANN_GLOBALS_H_
#include <gsl/gsl_rng.h>
diff --git a/src/aghermann/model/achermann-tunable.hh b/src/aghermann/model/achermann-tunable.hh
index 6b0e75c..f74940a 100644
--- a/src/aghermann/model/achermann-tunable.hh
+++ b/src/aghermann/model/achermann-tunable.hh
@@ -10,8 +10,8 @@
*/
-#ifndef _AGH_MODEL_ACHERMANN_TUNABLE_H
-#define _AGH_MODEL_ACHERMANN_TUNABLE_H
+#ifndef AGH_AGHERMANN_MODEL_ACHERMANN_TUNABLE_H_
+#define AGH_AGHERMANN_MODEL_ACHERMANN_TUNABLE_H_
#include <cstring>
#include <vector>
@@ -184,7 +184,7 @@ struct STunableSetWithState
} // namespace ach
} // namespace agh
-#endif
+#endif // AGH_AGHERMANN_MODEL_ACHERMANN_TUNABLE_H_
// Local Variables:
// Mode: c++
diff --git a/src/aghermann/model/achermann.hh b/src/aghermann/model/achermann.hh
index 5dd3a6e..498ed4a 100644
--- a/src/aghermann/model/achermann.hh
+++ b/src/aghermann/model/achermann.hh
@@ -9,8 +9,8 @@
* License: GPL
*/
-#ifndef _AGH_MODEL_ACHERMANN_H
-#define _AGH_MODEL_ACHERMANN_H
+#ifndef AGH_AGHERMANN_MODEL_ACHERMANN_H_
+#define AGH_AGHERMANN_MODEL_ACHERMANN_H_
#include <string>
#include <vector>
@@ -20,7 +20,7 @@
#include "libsigfile/forward-decls.hh"
#include "libsigfile/page.hh"
-#include "aghermann/metrics/page-metrics-base.hh"
+#include "libmetrics/page-metrics-base.hh"
#include "aghermann/expdesign/profile.hh"
#include "achermann-tunable.hh"
@@ -134,7 +134,7 @@ _which_gc( size_t p) const // selects episode egc by page, or returns &gc if !AZ
} // namespace ach
} // namespace agh
-#endif
+#endif // AGH_MODEL_ACHERMANN_H_
// Local Variables:
// Mode: c++
diff --git a/src/aghermann/model/beersma.hh b/src/aghermann/model/beersma.hh
index 60173d2..f05c365 100644
--- a/src/aghermann/model/beersma.hh
+++ b/src/aghermann/model/beersma.hh
@@ -9,8 +9,8 @@
* License: GPL
*/
-#ifndef _AGH_MODEL_BEERSMA_H
-#define _AGH_MODEL_BEERSMA_H
+#ifndef AGH_AGHERMANN_MODEL_BEERSMA_H_
+#define AGH_AGHERMANN_MODEL_BEERSMA_H_
#include <list>
@@ -18,7 +18,7 @@
#include <gsl/gsl_math.h>
#include <gsl/gsl_siman.h>
-#include "aghermann/metrics/page-metrics-base.hh"
+#include "libmetrics/page-metrics-base.hh"
#include "aghermann/expdesign/profile.hh"
@@ -170,7 +170,7 @@ analyse_deeper( const SUltradianCycle&,
} // namespace beersma
} // namespace agh
-#endif // _AGH_MODEL_BEERSMA_H
+#endif // AGH_AGHERMANN_MODEL_BEERSMA_H_
// Local Variables:
// Mode: c++
diff --git a/src/aghermann/model/borbely.cc b/src/aghermann/model/borbely.cc
index 37e62d8..0c54250 100644
--- a/src/aghermann/model/borbely.cc
+++ b/src/aghermann/model/borbely.cc
@@ -15,8 +15,8 @@
#include <gsl/gsl_blas.h>
#include "common/alg.hh"
-#include "aghermann/metrics/psd.hh"
-#include "aghermann/metrics/mc.hh"
+#include "libmetrics/psd.hh"
+#include "libmetrics/mc.hh"
#include "aghermann/expdesign/recording.hh"
#include "beersma.hh"
diff --git a/src/aghermann/model/forward-decls.hh b/src/aghermann/model/forward-decls.hh
index cc892dc..e807c92 100644
--- a/src/aghermann/model/forward-decls.hh
+++ b/src/aghermann/model/forward-decls.hh
@@ -1,5 +1,5 @@
/*
- * File name: model/forward-decls.hh
+ * File name: aghermann/model/forward-decls.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-08-26
@@ -10,8 +10,8 @@
*/
-#ifndef _AGH_MODEL_FORWARD_DECLS_H
-#define _AGH_MODEL_FORWARD_DECLS_H
+#ifndef AGH_AGHERMANN_MODEL_FORWARD_DECLS_H_
+#define AGH_AGHERMANN_MODEL_FORWARD_DECLS_H_
namespace agh {
@@ -38,7 +38,7 @@ namespace agh {
} // namespace agh
-#endif
+#endif // AGH_AGHERMANN_MODEL_FORWARD_DECLS_H_
// Local Variables:
// Mode: c++
diff --git a/src/aghermann/rk1968/rk1968.cc b/src/aghermann/rk1968/rk1968.cc
index 3f8424e..d7624d1 100644
--- a/src/aghermann/rk1968/rk1968.cc
+++ b/src/aghermann/rk1968/rk1968.cc
@@ -16,7 +16,7 @@
#include "libsigfile/source.hh"
#include "aghermann/expdesign/recording.hh"
#include "aghermann/expdesign/primaries.hh"
-#include "aghermann/metrics/bands.hh"
+#include "libmetrics/bands.hh"
#include "rk1968.hh"
diff --git a/src/aghermann/ui/globals.hh b/src/aghermann/ui/globals.hh
index d031345..ec96636 100644
--- a/src/aghermann/ui/globals.hh
+++ b/src/aghermann/ui/globals.hh
@@ -10,8 +10,8 @@
*/
-#ifndef _AGHUI_GLOBALS_H
-#define _AGHUI_GLOBALS_H
+#ifndef AGH_AGHERMANN_UI_GLOBALS_H_
+#define AGH_AGHERMANN_UI_GLOBALS_H_
#include <gtk/gtk.h>
#include <unique/unique.h>
diff --git a/src/aghermann/ui/misc.hh b/src/aghermann/ui/misc.hh
index c1492ae..0fe64d6 100644
--- a/src/aghermann/ui/misc.hh
+++ b/src/aghermann/ui/misc.hh
@@ -10,8 +10,8 @@
*/
-#ifndef _AGHUI_MISC_H
-#define _AGHUI_MISC_H
+#ifndef AGH_AGHERMANN_UI_MISC_H_
+#define AGH_AGHERMANN_UI_MISC_H_
#include "globals.hh"
diff --git a/src/aghermann/ui/mw/construct.cc b/src/aghermann/ui/mw/construct.cc
index 55a7cbb..49e1e3b 100644
--- a/src/aghermann/ui/mw/construct.cc
+++ b/src/aghermann/ui/mw/construct.cc
@@ -10,7 +10,7 @@
*/
-#include "aghermann/metrics/bands.hh"
+#include "libmetrics/bands.hh"
#include "aghermann/ui/ui.hh"
#include "widgets.hh"
#include "mw_cb.hh"
diff --git a/src/aghermann/ui/mw/mw.cc b/src/aghermann/ui/mw/mw.cc
index 4517173..eb4bad1 100644
--- a/src/aghermann/ui/mw/mw.cc
+++ b/src/aghermann/ui/mw/mw.cc
@@ -15,9 +15,9 @@
#include <signal.h>
#include "common/config-validate.hh"
-#include "aghermann/metrics/page-metrics-base.hh"
-#include "aghermann/metrics/mc-artifacts.hh"
-#include "aghermann/metrics/bands.hh"
+#include "libmetrics/page-metrics-base.hh"
+#include "libmetrics/mc-artifacts.hh"
+#include "libmetrics/bands.hh"
#include "aghermann/expdesign/primaries.hh"
#include "aghermann/model/beersma.hh"
#include "aghermann/ui/misc.hh"
diff --git a/src/aghermann/ui/mw/mw.hh b/src/aghermann/ui/mw/mw.hh
index 27cb582..e6f57e4 100644
--- a/src/aghermann/ui/mw/mw.hh
+++ b/src/aghermann/ui/mw/mw.hh
@@ -9,8 +9,8 @@
* License: GPL
*/
-#ifndef _AGHUI_EXPDESIGN_H
-#define _AGHUI_EXPDESIGN_H
+#ifndef AGH_AGHERMANN_UI_MW_MW_H_
+#define AGH_AGHERMANN_UI_MW_MW_H_
#include <string>
#include <list>
@@ -22,7 +22,7 @@
#include "common/lang.hh"
#include "common/config-validate.hh"
-#include "aghermann/metrics/mc-artifacts.hh"
+#include "libmetrics/mc-artifacts.hh"
#include "aghermann/model/forward-decls.hh"
#include "aghermann/expdesign/primaries.hh"
#include "aghermann/ui/ui.hh"
diff --git a/src/aghermann/ui/mw/mw_cb.hh b/src/aghermann/ui/mw/mw_cb.hh
index de352f1..6582430 100644
--- a/src/aghermann/ui/mw/mw_cb.hh
+++ b/src/aghermann/ui/mw/mw_cb.hh
@@ -9,8 +9,8 @@
* License: GPL
*/
-#ifndef _AGH_UI_MW_CB_H
-#define _AGH_UI_MW_CB_H
+#ifndef AGH_AGHERMANN_UI_MW_MW_CB_H_
+#define AGH_AGHERMANN_UI_MW_MW_CB_H_
#include <gtk/gtk.h>
diff --git a/src/aghermann/ui/mw/widgets.hh b/src/aghermann/ui/mw/widgets.hh
index decaa87..d18d9e2 100644
--- a/src/aghermann/ui/mw/widgets.hh
+++ b/src/aghermann/ui/mw/widgets.hh
@@ -9,13 +9,13 @@
* License: GPL
*/
-#ifndef _AGHUI_EXPDESIGN_WIDGETS_H
-#define _AGHUI_EXPDESIGN_WIDGETS_H
+#ifndef AGH_AGHERMANN_UI_MW_WIDGETS_H_
+#define AGH_AGHERMANN_UI_MW_WIDGETS_H_
#include <map>
#include <gtk/gtk.h>
#include "libsigfile/page.hh" // for various enums
-#include "aghermann/metrics/bands.hh"
+#include "libmetrics/bands.hh"
#include "aghermann/model/achermann-tunable.hh"
#include "aghermann/ui/ui.hh" // for SManagedColor
diff --git a/src/aghermann/ui/sf/channel.cc b/src/aghermann/ui/sf/channel.cc
index 1e5754a..0e27f77 100644
--- a/src/aghermann/ui/sf/channel.cc
+++ b/src/aghermann/ui/sf/channel.cc
@@ -15,7 +15,7 @@
#include "common/lang.hh"
#include "common/config-validate.hh"
#include "libsigproc/exstrom.hh"
-#include "aghermann/metrics/bands.hh"
+#include "libmetrics/bands.hh"
#include "aghermann/ui/globals.hh"
#include "sf.hh"
diff --git a/src/aghermann/ui/sf/d/artifacts-simple.hh b/src/aghermann/ui/sf/d/artifacts-simple.hh
index a4618b7..7e54753 100644
--- a/src/aghermann/ui/sf/d/artifacts-simple.hh
+++ b/src/aghermann/ui/sf/d/artifacts-simple.hh
@@ -9,8 +9,8 @@
* License: GPL
*/
-#ifndef _AGH_UI_SF_ARTIFACTS_SIMPLE_H
-#define _AGH_UI_SF_ARTIFACTS_SIMPLE_H
+#ifndef AGH_AGHERMANN_UI_SF_D_ARTIFACTS_SIMPLE_H_
+#define AGH_AGHERMANN_UI_SF_D_ARTIFACTS_SIMPLE_H_
#include <gtk/gtk.h>
diff --git a/src/aghermann/ui/sf/d/artifacts.hh b/src/aghermann/ui/sf/d/artifacts.hh
index 2452f41..a061878 100644
--- a/src/aghermann/ui/sf/d/artifacts.hh
+++ b/src/aghermann/ui/sf/d/artifacts.hh
@@ -9,14 +9,14 @@
* License: GPL
*/
-#ifndef _AGH_UI_SF_D_ARTIFACTS_H
-#define _AGH_UI_SF_D_ARTIFACTS_H
+#ifndef AGH_AGHERMANN_UI_SF_D_ARTIFACTS_H_
+#define AGH_AGHERMANN_UI_SF_D_ARTIFACTS_H_
#include <list>
#include <gtk/gtk.h>
-#include "aghermann/metrics/mc-artifacts.hh"
+#include "libmetrics/mc-artifacts.hh"
#include "libsigfile/source-base.hh"
#include "aghermann/ui/ui++.hh"
#include "aghermann/ui/sf/sf.hh"
diff --git a/src/aghermann/ui/sf/d/filters.hh b/src/aghermann/ui/sf/d/filters.hh
index 42c4151..efa9fbf 100644
--- a/src/aghermann/ui/sf/d/filters.hh
+++ b/src/aghermann/ui/sf/d/filters.hh
@@ -9,8 +9,8 @@
* License: GPL
*/
-#ifndef _AGH_UI_SF_D_FILTERS_H
-#define _AGH_UI_SF_D_FILTERS_H
+#ifndef AGH_AGHERMANN_UI_SF_D_FILTERS_H_
+#define AGH_AGHERMANN_UI_SF_D_FILTERS_H_
#include <gtk/gtk.h>
diff --git a/src/aghermann/ui/sf/d/patterns.hh b/src/aghermann/ui/sf/d/patterns.hh
index c5bab7b..364dee7 100644
--- a/src/aghermann/ui/sf/d/patterns.hh
+++ b/src/aghermann/ui/sf/d/patterns.hh
@@ -9,8 +9,8 @@
* License: GPL
*/
-#ifndef _AGH_UI_SF_D_PATTERNS_H
-#define _AGH_UI_SF_D_PATTERNS_H
+#ifndef AGH_AGHERMANN_UI_SF_D_PATTERNS_H_
+#define AGH_AGHERMANN_UI_SF_D_PATTERNS_H_
#include "aghermann/patterns/patterns.hh"
#include "aghermann/ui/sf/sf.hh"
diff --git a/src/aghermann/ui/sf/d/phasediff.hh b/src/aghermann/ui/sf/d/phasediff.hh
index 1448ea1..ff1a8b7 100644
--- a/src/aghermann/ui/sf/d/phasediff.hh
+++ b/src/aghermann/ui/sf/d/phasediff.hh
@@ -9,8 +9,8 @@
* License: GPL
*/
-#ifndef _AGH_UI_SF_D_PHASEDIFF_H
-#define _AGH_UI_SF_D_PHASEDIFF_H
+#ifndef AGHERMANN_UI_SF_D_PHASEDIFF_H_
+#define AGHERMANN_UI_SF_D_PHASEDIFF_H_
#include "aghermann/ui/sf/sf.hh"
diff --git a/src/aghermann/ui/sf/montage-overlays.cc b/src/aghermann/ui/sf/montage-overlays.cc
index 49cc968..f3a76cc 100644
--- a/src/aghermann/ui/sf/montage-overlays.cc
+++ b/src/aghermann/ui/sf/montage-overlays.cc
@@ -12,7 +12,7 @@
#include <cairo/cairo-svg.h>
#include "common/lang.hh"
-#include "aghermann/metrics/bands.hh"
+#include "libmetrics/bands.hh"
#include "aghermann/ui/misc.hh"
#include "sf.hh"
diff --git a/src/aghermann/ui/sf/sf.cc b/src/aghermann/ui/sf/sf.cc
index 71c9257..fe6d41f 100644
--- a/src/aghermann/ui/sf/sf.cc
+++ b/src/aghermann/ui/sf/sf.cc
@@ -13,7 +13,7 @@
#include "common/config-validate.hh"
#include "common/fs.hh"
-#include "aghermann/metrics/bands.hh"
+#include "libmetrics/bands.hh"
#include "aghermann/ui/misc.hh"
#include "sf.hh"
diff --git a/src/aghermann/ui/sf/sf.hh b/src/aghermann/ui/sf/sf.hh
index 0eaf85a..6aedb3a 100644
--- a/src/aghermann/ui/sf/sf.hh
+++ b/src/aghermann/ui/sf/sf.hh
@@ -9,8 +9,8 @@
* License: GPL
*/
-#ifndef _AGH_UI_SF_H
-#define _AGH_UI_SF_H
+#ifndef AGH_AGHERMANN_UI_SF_SF_H_
+#define AGH_AGHERMANN_UI_SF_SF_H_
#include <map>
#include <list>
@@ -23,7 +23,7 @@
#include "libsigproc/winfun.hh"
#include "libsigproc/sigproc.hh"
#include "aghermann/patterns/patterns.hh"
-#include "aghermann/metrics/mc-artifacts.hh"
+#include "libmetrics/mc-artifacts.hh"
#include "aghermann/expdesign/primaries.hh"
#include "aghermann/ica/ica.hh"
#include "aghermann/ui/globals.hh"
diff --git a/src/aghermann/ui/sf/sf_cb.hh b/src/aghermann/ui/sf/sf_cb.hh
index cc00963..01fdc13 100644
--- a/src/aghermann/ui/sf/sf_cb.hh
+++ b/src/aghermann/ui/sf/sf_cb.hh
@@ -9,8 +9,8 @@
* License: GPL
*/
-#ifndef _AGH_UI_SF_CB_H
-#define _AGH_UI_SF_CB_H
+#ifndef AGH_AGHERMANN_UI_SF_SF_CB_H_
+#define AGH_AGHERMANN_UI_SF_SF_CB_H_
#include <cairo/cairo.h>
#include <gtk/gtk.h>
diff --git a/src/aghermann/ui/sf/widgets.hh b/src/aghermann/ui/sf/widgets.hh
index 9da4300..2a4abe6 100644
--- a/src/aghermann/ui/sf/widgets.hh
+++ b/src/aghermann/ui/sf/widgets.hh
@@ -9,8 +9,8 @@
* License: GPL
*/
-#ifndef _AGH_UI_SCORING_FACILITY_WIDGETS_H
-#define _AGH_UI_SCORING_FACILITY_WIDGETS_H
+#ifndef AGH_AGHERMANN_UI_SF_WIDGETS_H_
+#define AGH_AGHERMANN_UI_SF_WIDGETS_H_
#include <gtk/gtk.h>
diff --git a/src/aghermann/ui/ui++.hh b/src/aghermann/ui/ui++.hh
index f5583e0..2bbf946 100644
--- a/src/aghermann/ui/ui++.hh
+++ b/src/aghermann/ui/ui++.hh
@@ -10,8 +10,8 @@
*/
-#ifndef _AGHUI_PLUSPLUS_UI_H
-#define _AGHUI_PLUSPLUS_UI_H
+#ifndef AGH_AGHERMANN_UI_UI_PLUSPLUS_H_
+#define AGH_AGHERMANN_UI_UI_PLUSPLUS_H_
#include <cstring>
#include <string>
diff --git a/src/aghermann/ui/ui.hh b/src/aghermann/ui/ui.hh
index cc0fcb9..d21bf26 100644
--- a/src/aghermann/ui/ui.hh
+++ b/src/aghermann/ui/ui.hh
@@ -11,8 +11,8 @@
*/
-#ifndef _AGHUI_UI_H
-#define _AGHUI_UI_H
+#ifndef AGH_AGHERMANN_UI_UI_H_
+#define AGH_AGHERMANN_UI_UI_H_
#include <cstdlib>
#include <cstring>
diff --git a/src/aghermann/metrics/Makefile.am b/src/libmetrics/Makefile.am
similarity index 70%
rename from src/aghermann/metrics/Makefile.am
rename to src/libmetrics/Makefile.am
index 39ea799..76bb986 100644
--- a/src/aghermann/metrics/Makefile.am
+++ b/src/libmetrics/Makefile.am
@@ -1,11 +1,12 @@
AM_CXXFLAGS := \
- -Wall -std=c++0x -fno-rtti \
+ -Wall -std=c++0x -fno-rtti -shared -fPIC \
$(OPENMP_CXXFLAGS) \
-I$(top_srcdir)/src
-noinst_LIBRARIES := \
- liba.a
-liba_a_SOURCES := \
+pkglib_LTLIBRARIES := \
+ libmetrics.la
+
+libmetrics_la_SOURCES := \
forward-decls.hh \
bands.hh \
page-metrics-base.hh \
@@ -21,6 +22,11 @@ liba_a_SOURCES := \
mc-artifacts.ii \
all.hh
+libmetrics_la_LDFLAGS := \
+ -avoid-version \
+ -rpath $(libdir)/$(PACKAGE) \
+ -shared -module
+
if DO_PCH
BUILT_SOURCES := \
forward-decls.hh.gch \
diff --git a/src/aghermann/metrics/all.hh b/src/libmetrics/all.hh
similarity index 69%
rename from src/aghermann/metrics/all.hh
rename to src/libmetrics/all.hh
index fc26de7..ae43371 100644
--- a/src/aghermann/metrics/all.hh
+++ b/src/libmetrics/all.hh
@@ -1,5 +1,5 @@
/*
- * File name: aghermann/metrics/all.hh
+ * File name: libmetrics/all.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
*
@@ -10,14 +10,14 @@
* License: GPL
*/
-#ifndef _METRICS_ALL_H
-#define _METRICS_ALL_H
+#ifndef AGH_LIBMETRICS_ALL_H_
+#define AGH_LIBMETRICS_ALL_H_
#include "psd.hh"
#include "mc.hh"
#include "swu.hh"
-#endif // _METRICS_ALL_H
+#endif // AGH_LIBMETRICS_ALL_H_
// Local Variables:
// Mode: c++
diff --git a/src/aghermann/metrics/bands.hh b/src/libmetrics/bands.hh
similarity index 80%
rename from src/aghermann/metrics/bands.hh
rename to src/libmetrics/bands.hh
index 6873c31..c8783f3 100644
--- a/src/aghermann/metrics/bands.hh
+++ b/src/libmetrics/bands.hh
@@ -1,5 +1,5 @@
/*
- * File name: aghermann/metrics/bands.hh
+ * File name: libmetrics/bands.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
*
@@ -11,8 +11,8 @@
* License: GPL
*/
-#ifndef _METRICS_BANDS_H
-#define _METRICS_BANDS_H
+#ifndef AGH_LIBMETRICS_BANDS_H
+#define AGH_LIBMETRICS_BANDS_H
#if HAVE_CONFIG_H && !defined(VERSION)
# include "config.h"
@@ -33,7 +33,7 @@ enum TBand {
} // namespace metrics
-#endif // _METRICS_BANDS_H
+#endif // AGH_LIBMETRICS_BANDS_H
// Local Variables:
// Mode: c++
diff --git a/src/aghermann/metrics/forward-decls.hh b/src/libmetrics/forward-decls.hh
similarity index 76%
rename from src/aghermann/metrics/forward-decls.hh
rename to src/libmetrics/forward-decls.hh
index 440d8cc..ddfb0ba 100644
--- a/src/aghermann/metrics/forward-decls.hh
+++ b/src/libmetrics/forward-decls.hh
@@ -1,5 +1,5 @@
/*
- * File name: metrics/forward-decls.hh
+ * File name: libmetrics/forward-decls.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Initial version: 2012-11-08
@@ -10,8 +10,8 @@
*/
-#ifndef _METRICS_FORWARD_DECLS_H
-#define _METRICS_FORWARD_DECLS_H
+#ifndef AGH_LIBMETRICS_FORWARD_DECLS_H_
+#define AGH_LIBMETRICS_FORWARD_DECLS_H_
namespace metrics {
@@ -40,7 +40,7 @@ namespace phasic {
} // namespace metrics
-#endif // _METRICS_FORWARD_DECLS_H
+#endif // AGH_LIBMETRICS_FORWARD_DECLS_H_
// Local Variables:
// Mode: c++
diff --git a/src/aghermann/metrics/mc-artifacts.cc b/src/libmetrics/mc-artifacts.cc
similarity index 96%
rename from src/aghermann/metrics/mc-artifacts.cc
rename to src/libmetrics/mc-artifacts.cc
index 12e40bc..da1289d 100644
--- a/src/aghermann/metrics/mc-artifacts.cc
+++ b/src/libmetrics/mc-artifacts.cc
@@ -1,5 +1,5 @@
/*
- * File name: aghermann/metrics/mc-artifacts.cc
+ * File name: libmetrics/mc-artifacts.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
*
diff --git a/src/aghermann/metrics/mc-artifacts.hh b/src/libmetrics/mc-artifacts.hh
similarity index 90%
rename from src/aghermann/metrics/mc-artifacts.hh
rename to src/libmetrics/mc-artifacts.hh
index efe91e3..8e8d23a 100644
--- a/src/aghermann/metrics/mc-artifacts.hh
+++ b/src/libmetrics/mc-artifacts.hh
@@ -1,5 +1,5 @@
/*
- * File name: aghermann/metrics/mc-artifacts.hh
+ * File name: libmetrics/mc-artifacts.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
*
@@ -10,8 +10,8 @@
* License: GPL
*/
-#ifndef _AGH_METRICS_MC_ARTIFACTS_H
-#define _AGH_METRICS_MC_ARTIFACTS_H
+#ifndef AGH_LIBMETRICS_MC_ARTIFACTS_H_
+#define AGH_LIBMETRICS_MC_ARTIFACTS_H_
#include <vector>
#include <valarray>
@@ -76,7 +76,7 @@ estimate_E( const valarray<T>& sssu_diff,
} // namespace metrics
-#endif // _AGH_METRICS_MC_ARTIFACTS_H
+#endif // AGH_LIBMETRICS_MC_ARTIFACTS_H_
// Local Variables:
// Mode: c++
diff --git a/src/aghermann/metrics/mc-artifacts.ii b/src/libmetrics/mc-artifacts.ii
similarity index 95%
rename from src/aghermann/metrics/mc-artifacts.ii
rename to src/libmetrics/mc-artifacts.ii
index 70ea76d..237dee1 100644
--- a/src/aghermann/metrics/mc-artifacts.ii
+++ b/src/libmetrics/mc-artifacts.ii
@@ -1,5 +1,5 @@
/*
- * File name: aghermann/metrics/mc-artifacts.ii
+ * File name: libmetrics/mc-artifacts.ii
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
*
diff --git a/src/aghermann/metrics/mc.cc b/src/libmetrics/mc.cc
similarity index 98%
rename from src/aghermann/metrics/mc.cc
rename to src/libmetrics/mc.cc
index 0181834..e0cab6c 100644
--- a/src/aghermann/metrics/mc.cc
+++ b/src/libmetrics/mc.cc
@@ -1,5 +1,5 @@
/*
- * File name: aghermann/metrics/mc.cc
+ * File name: libmetrics/mc.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
*
diff --git a/src/aghermann/metrics/mc.hh b/src/libmetrics/mc.hh
similarity index 97%
rename from src/aghermann/metrics/mc.hh
rename to src/libmetrics/mc.hh
index 5e17f8d..6791507 100644
--- a/src/aghermann/metrics/mc.hh
+++ b/src/libmetrics/mc.hh
@@ -1,5 +1,5 @@
/*
- * File name: metrics/mc.hh
+ * File name: libmetrics/mc.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
*
@@ -11,8 +11,8 @@
* License: GPL
*/
-#ifndef _METRICS_MC_H
-#define _METRICS_MC_H
+#ifndef AGH_LIBMETRICS_MC_H_
+#define AGH_LIBMETRICS_MC_H_
#include "libsigproc/ext-filters.hh"
#include "forward-decls.hh"
@@ -205,7 +205,7 @@ do_sssu_reduction( const valarray<T>& S,
} // namespace mc
} // namespace metrics
-#endif // _METRICS_MC_H
+#endif // AGH_LIBMETRICS_MC_H_
// Local Variables:
// Mode: c++
diff --git a/src/aghermann/metrics/page-metrics-base.cc b/src/libmetrics/page-metrics-base.cc
similarity index 98%
rename from src/aghermann/metrics/page-metrics-base.cc
rename to src/libmetrics/page-metrics-base.cc
index 2a06816..e1faeab 100644
--- a/src/aghermann/metrics/page-metrics-base.cc
+++ b/src/libmetrics/page-metrics-base.cc
@@ -1,5 +1,5 @@
/*
- * File name: aghermann/metrics/page-metrics-base.cc
+ * File name: libmetrics/page-metrics-base.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
*
diff --git a/src/aghermann/metrics/page-metrics-base.hh b/src/libmetrics/page-metrics-base.hh
similarity index 95%
rename from src/aghermann/metrics/page-metrics-base.hh
rename to src/libmetrics/page-metrics-base.hh
index 2ed7ed7..61242a0 100644
--- a/src/aghermann/metrics/page-metrics-base.hh
+++ b/src/libmetrics/page-metrics-base.hh
@@ -1,5 +1,5 @@
/*
- * File name: aghermann/metrics/page-metrics-base.hh
+ * File name: libmetrics/page-metrics-base.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
*
@@ -10,8 +10,8 @@
* License: GPL
*/
-#ifndef _METRICS_PAGE_METRICS_BASE_H
-#define _METRICS_PAGE_METRICS_BASE_H
+#ifndef AGH_LIBMETRICS_PAGE_METRICS_BASE_H_
+#define AGH_LIBMETRICS_PAGE_METRICS_BASE_H_
#include <list>
#include <valarray>
@@ -190,7 +190,7 @@ class CProfile {
} // namespace metrics
-#endif // _METRICS_PAGE_METRICS_BASE_H
+#endif // AGH_LIBMETRICS_PAGE_METRICS_BASE_H_
// Local Variables:
// Mode: c++
diff --git a/src/aghermann/metrics/psd.cc b/src/libmetrics/psd.cc
similarity index 99%
rename from src/aghermann/metrics/psd.cc
rename to src/libmetrics/psd.cc
index f7c9861..eed2da7 100644
--- a/src/aghermann/metrics/psd.cc
+++ b/src/libmetrics/psd.cc
@@ -1,5 +1,5 @@
/*
- * File name: aghermann/metrics/psd.cc
+ * File name: libmetrics/psd.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
* Parts from PhysioToolKit (http://www.physionet.org/physiotools,
diff --git a/src/aghermann/metrics/psd.hh b/src/libmetrics/psd.hh
similarity index 95%
rename from src/aghermann/metrics/psd.hh
rename to src/libmetrics/psd.hh
index b70401f..55eb346 100644
--- a/src/aghermann/metrics/psd.hh
+++ b/src/libmetrics/psd.hh
@@ -1,5 +1,5 @@
/*
- * File name: aghermann/metrics/psd.hh
+ * File name: libmetrics/psd.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
*
@@ -10,8 +10,8 @@
* License: GPL
*/
-#ifndef _METRICS_PSD_H
-#define _METRICS_PSD_H
+#ifndef AGH_LIBMETRICS_PSD_H_
+#define AGH_LIBMETRICS_PSD_H_
#include <string>
#include <list>
@@ -167,7 +167,7 @@ class CProfile
} // namespace metrics
-#endif // _METRICS_PSD_H
+#endif // AGH_LIBMETRICS_PSD_H_
// Local Variables:
// Mode: c++
diff --git a/src/aghermann/metrics/swu.cc b/src/libmetrics/swu.cc
similarity index 98%
rename from src/aghermann/metrics/swu.cc
rename to src/libmetrics/swu.cc
index 70fa4de..1566c76 100644
--- a/src/aghermann/metrics/swu.cc
+++ b/src/libmetrics/swu.cc
@@ -1,5 +1,5 @@
/*
- * File name: aghermann/metrics/swu.cc
+ * File name: libmetrics/swu.cc
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
*
diff --git a/src/aghermann/metrics/swu.hh b/src/libmetrics/swu.hh
similarity index 92%
rename from src/aghermann/metrics/swu.hh
rename to src/libmetrics/swu.hh
index c4991c8..03c9c3e 100644
--- a/src/aghermann/metrics/swu.hh
+++ b/src/libmetrics/swu.hh
@@ -1,5 +1,5 @@
/*
- * File name: aghermann/metrics/swu.hh
+ * File name: libmetrics/swu.hh
* Project: Aghermann
* Author: Andrei Zavada <johnhommer at gmail.com>
*
@@ -10,8 +10,8 @@
* License: GPL
*/
-#ifndef _METRICS_SWU_H
-#define _METRICS_SWU_H
+#ifndef AGH_LIBMETRICS_SWU_H_
+#define AGH_LIBMETRICS_SWU_H_
#include <string>
#include <list>
@@ -98,7 +98,7 @@ class CProfile
} // namespace metrics
-#endif // _METRICS_SWU_H
+#endif // AGH_LIBMETRICS_SWU_H_
// Local Variables:
// Mode: c++
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index a74ea21..ddd41dd 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -6,6 +6,7 @@ bin_PROGRAMS := \
edfcat \
edfhed \
edfhed-gtk
+# agh-profile-gen
edfcat_SOURCES := \
edfcat.cc
--
Sleep experiment manager
More information about the debian-med-commit
mailing list