[med-svn] [SCM] aghermann branch, master, updated. 99b1d5a023eee9df74b0e0d6f894516fc79435ad

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 35fc8661a6ea3415d633ff8a7bb320835e8ba6b1
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Fri May 24 17:24:57 2013 +0300

    build sf/d sources as part of sf sources

diff --git a/configure.ac b/configure.ac
index fc9bb6f..5352535 100644
--- a/configure.ac
+++ b/configure.ac
@@ -206,7 +206,6 @@ AC_OUTPUT([
 	src/aghermann/ui/sm/Makefile
 	src/aghermann/ui/mw/Makefile
 	src/aghermann/ui/sf/Makefile
-	src/aghermann/ui/sf/d/Makefile
 	src/aghermann/ui/mf/Makefile
 
 	src/tools/Makefile
diff --git a/src/aghermann/Makefile.am b/src/aghermann/Makefile.am
index 82302c0..e64f578 100644
--- a/src/aghermann/Makefile.am
+++ b/src/aghermann/Makefile.am
@@ -23,7 +23,6 @@ aghermann_LDADD := \
 	ui/sm/liba.a \
 	ui/mw/liba.a \
 	ui/sf/liba.a \
-	ui/sf/d/liba.a \
 	ui/mf/liba.a \
 	ui/liba.a \
 	model/liba.a \
diff --git a/src/aghermann/ui/sf/Makefile.am b/src/aghermann/ui/sf/Makefile.am
index 458bac6..deed960 100644
--- a/src/aghermann/ui/sf/Makefile.am
+++ b/src/aghermann/ui/sf/Makefile.am
@@ -1,6 +1,3 @@
-SUBDIRS := \
-	d
-
 AM_CXXFLAGS := \
 	-std=c++0x -fno-rtti -Wdeprecated-declarations -Wall \
 	$(GTK_CFLAGS)  $(UNIQUE_CFLAGS)  $(CAIRO_CFLAGS) $(LIBCONFIGXX_CFLAGS) \
@@ -24,14 +21,39 @@ liba_a_SOURCES := \
 	sf.cc \
 	sf.hh \
 	sf_cb.hh \
-	sf_cb.cc
-
+	sf_cb.cc \
+	d/artifacts.hh \
+	d/artifacts.cc \
+	d/artifacts-construct.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-construct.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
 
 if DO_PCH
 BUILT_SOURCES = \
 	sf.hh.gch \
 	sf_cb.hh.gch \
-	widgets.hh.gch
+	widgets.hh.gch \
+	d/artifacts.hh.gch \
+	d/patterns.hh.gch \
+	d/filters.hh.gch \
+	d/phasediff.hh.gch
 %.hh.gch: %.hh
 	$(CXXCOMPILE) -c $<
 CLEANFILES = \
diff --git a/src/aghermann/ui/sf/d/Makefile.am b/src/aghermann/ui/sf/d/Makefile.am
deleted file mode 100644
index ae78f9d..0000000
--- a/src/aghermann/ui/sf/d/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-AM_CXXFLAGS := \
-	-std=c++0x -fno-rtti -Wdeprecated-declarations -Wall \
-	$(GTK_CFLAGS) $(UNIQUE_CFLAGS) $(CAIRO_CFLAGS) \
-	-DPACKAGE_DATADIR=\"$(datadir)\" \
-	$(OPENMP_CXXFLAGS) \
-	-I$(top_srcdir)/src
-
-noinst_LIBRARIES := liba.a
-
-liba_a_SOURCES := \
-	artifacts.hh \
-	artifacts.cc \
-	artifacts-construct.cc \
-	artifacts_cb.cc \
-	artifacts-simple.hh \
-	artifacts-simple.cc \
-	artifacts-simple-construct.cc \
-	filters.hh \
-	filters.cc \
-	filters-construct.cc \
-	filters_cb.cc \
-	patterns.hh \
-	patterns.cc \
-	patterns-construct.cc \
-	patterns-draw.cc \
-	patterns-profiles.cc \
-	patterns_cb.cc \
-	patterns-profiles_cb.cc \
-	phasediff.hh \
-	phasediff.cc \
-	phasediff-construct.cc \
-	phasediff_cb.cc
-
-CLEANFILES := \
-	liba.la
-
-if DO_PCH
-BUILT_SOURCES = \
-	artifacts.hh.gch \
-	patterns.hh.gch \
-	filters.hh.gch \
-	phasediff.hh.gch
-%.hh.gch: %.hh
-	$(CXXCOMPILE) -c $<
-CLEANFILES += \
-	$(BUILT_SOURCES)
-endif

-- 
Sleep experiment manager