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

[Andrei Zavada]

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

    more accurate make clean

diff --git a/src/aghermann/expdesign/Makefile.am b/src/aghermann/expdesign/Makefile.am
index 989f62b..3d7a57a 100644
--- a/src/aghermann/expdesign/Makefile.am
+++ b/src/aghermann/expdesign/Makefile.am
@@ -15,9 +15,6 @@ liba_a_SOURCES := \
 	recording.hh \
 	profile.hh
 
-CLEANFILES := \
-	liba.la
-
 if DO_PCH
 BUILT_SOURCES := \
 	forward-decls.hh.gch \
@@ -26,6 +23,6 @@ BUILT_SOURCES := \
 	primaries.hh.gch
 %.hh.gch: %.hh
 	$(CXXCOMPILE) -c $<
-CLEANFILES += \
+CLEANFILES = \
 	$(BUILT_SOURCES)
 endif
diff --git a/src/aghermann/metrics/Makefile.am b/src/aghermann/metrics/Makefile.am
index 9ff6e62..df4449c 100644
--- a/src/aghermann/metrics/Makefile.am
+++ b/src/aghermann/metrics/Makefile.am
@@ -20,20 +20,16 @@ liba_a_SOURCES := \
 	mc-artifacts.ii \
 	all.hh
 
-CLEANFILES := \
-	liba.la
-
 if DO_PCH
 BUILT_SOURCES := \
 	forward-decls.hh.gch \
-	page-metrics-base.hh \
+	page-metrics-base.hh.gch \
 	psd.hh.gch \
 	swu.hh.gch \
 	mc.hh.gch \
-	mc-artifacts.hh.gch \
-	all.hh.gch
+	mc-artifacts.hh.gch
 %.hh.gch: %.hh
 	$(CXXCOMPILE) -c $<
-CLEANFILES += \
+CLEANFILES = \
 	$(BUILT_SOURCES)
 endif
diff --git a/src/aghermann/metrics/page-metrics-base.hh b/src/aghermann/metrics/page-metrics-base.hh
index 446d54e..2ed7ed7 100644
--- a/src/aghermann/metrics/page-metrics-base.hh
+++ b/src/aghermann/metrics/page-metrics-base.hh
@@ -196,4 +196,3 @@ class CProfile {
 // Mode: c++
 // indent-tabs-mode: 8
 // End:
-
diff --git a/src/aghermann/model/Makefile.am b/src/aghermann/model/Makefile.am
index 7bd351e..71ef17e 100644
--- a/src/aghermann/model/Makefile.am
+++ b/src/aghermann/model/Makefile.am
@@ -15,9 +15,6 @@ liba_a_SOURCES := \
 	beersma.hh \
 	forward-decls.hh
 
-CLEANFILES := \
-	liba.la
-
 if DO_PCH
 BUILT_SOURCES := \
 	achermann.hh.gch \
@@ -26,6 +23,6 @@ BUILT_SOURCES := \
 	forward-decls.hh.gch
 %.hh.gch: %.hh
 	$(CXXCOMPILE) -c $<
-CLEANFILES += \
+CLEANFILES = \
 	$(BUILT_SOURCES)
 endif
diff --git a/src/aghermann/patterns/Makefile.am b/src/aghermann/patterns/Makefile.am
index f5ac1e1..23c6193 100644
--- a/src/aghermann/patterns/Makefile.am
+++ b/src/aghermann/patterns/Makefile.am
@@ -7,15 +7,12 @@ noinst_LIBRARIES := liba.a
 liba_a_SOURCES := \
 	patterns.cc patterns.hh patterns.ii
 
-CLEANFILES := \
-	liba.la
-
 if DO_PCH
 BUILT_SOURCES := \
 	patterns.hh.gch
 %.hh.gch: %.hh
 	$(CXXCOMPILE) -c $<
-CLEANFILES += \
+CLEANFILES = \
 	$(BUILT_SOURCES)
 endif
 
diff --git a/src/aghermann/rk1968/Makefile.am b/src/aghermann/rk1968/Makefile.am
index 3d9d3e8..79afdbb 100644
--- a/src/aghermann/rk1968/Makefile.am
+++ b/src/aghermann/rk1968/Makefile.am
@@ -8,14 +8,11 @@ liba_a_SOURCES := \
 	rk1968.cc \
 	rk1968.hh
 
-CLEANFILES := \
-	liba.la
-
 if DO_PCH
 BUILT_SOURCES := \
 	rk1968.hh.gch
 %.hh.gch: %.hh
 	$(CXXCOMPILE) -c $<
-CLEANFILES += \
+CLEANFILES = \
 	$(BUILT_SOURCES)
 endif
diff --git a/src/aghermann/ui/Makefile.am b/src/aghermann/ui/Makefile.am
index 3ab57b6..84dac2a 100644
--- a/src/aghermann/ui/Makefile.am
+++ b/src/aghermann/ui/Makefile.am
@@ -16,9 +16,6 @@ liba_a_SOURCES := \
 	ui++.hh \
 	ui.hh
 
-CLEANFILES := \
-	liba.la
-
 if DO_PCH
 BUILT_SOURCES := \
 	forward-decls.hh.gch \
@@ -28,6 +25,6 @@ BUILT_SOURCES := \
 	ui.hh.gch
 %.hh.gch: %.hh
 	$(CXXCOMPILE) -c $<
-CLEANFILES += \
+CLEANFILES = \
 	$(BUILT_SOURCES)
 endif
diff --git a/src/aghermann/ui/mf/Makefile.am b/src/aghermann/ui/mf/Makefile.am
index 83cb2e0..5779d6f 100644
--- a/src/aghermann/ui/mf/Makefile.am
+++ b/src/aghermann/ui/mf/Makefile.am
@@ -14,15 +14,12 @@ liba_a_SOURCES := \
 	mf_cb.cc \
 	mf_cb.hh
 
-CLEANFILES := \
-	liba.la
-
 if DO_PCH
 BUILT_SOURCES := \
 	mf.hh.gch \
 	mf_cb.hh.gch
 %.hh.gch: %.hh
 	$(CXXCOMPILE) -c $<
-CLEANFILES += \
+CLEANFILES = \
 	$(BUILT_SOURCES)
 endif
diff --git a/src/aghermann/ui/mw/Makefile.am b/src/aghermann/ui/mw/Makefile.am
index 8f2d1b8..465fc77 100644
--- a/src/aghermann/ui/mw/Makefile.am
+++ b/src/aghermann/ui/mw/Makefile.am
@@ -25,9 +25,6 @@ liba_a_SOURCES = \
 	mw_cb.cc \
 	mw_cb.hh
 
-CLEANFILES := \
-	liba.la
-
 if DO_PCH
 BUILT_SOURCES = \
 	mw.hh.gch \
@@ -35,6 +32,6 @@ BUILT_SOURCES = \
 	mw_cb.hh.gch
 %.hh.gch: %.hh
 	$(CXXCOMPILE) -c $<
-CLEANFILES += \
+CLEANFILES = \
 	$(BUILT_SOURCES)
 endif
diff --git a/src/aghermann/ui/sf/Makefile.am b/src/aghermann/ui/sf/Makefile.am
index 3ce22bb..458bac6 100644
--- a/src/aghermann/ui/sf/Makefile.am
+++ b/src/aghermann/ui/sf/Makefile.am
@@ -26,8 +26,6 @@ liba_a_SOURCES := \
 	sf_cb.hh \
 	sf_cb.cc
 
-CLEANFILES := \
-	liba.la
 
 if DO_PCH
 BUILT_SOURCES = \
@@ -36,6 +34,6 @@ BUILT_SOURCES = \
 	widgets.hh.gch
 %.hh.gch: %.hh
 	$(CXXCOMPILE) -c $<
-CLEANFILES += \
+CLEANFILES = \
 	$(BUILT_SOURCES)
 endif
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 8954946..85e3099 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -16,9 +16,6 @@ liba_a_SOURCES := \
 	lang.hh \
 	subject_id.hh
 
-CLEANFILES := \
-	*.la
-
 if DO_PCH
 BUILT_SOURCES := \
 	config-validate.hh.gch \
@@ -31,6 +28,6 @@ BUILT_SOURCES := \
 
 %.hh.gch: %.hh
 	$(CXXCOMPILE) -c $<
-CLEANFILES += \
+CLEANFILES = \
 	$(BUILT_SOURCES)
 endif
diff --git a/src/libsigfile/Makefile.am b/src/libsigfile/Makefile.am
index 1272ad9..392ad08 100644
--- a/src/libsigfile/Makefile.am
+++ b/src/libsigfile/Makefile.am
@@ -46,7 +46,7 @@ BUILT_SOURCES := \
 %.hh.gch: %.hh
 	$(CXXCOMPILE) -c $<
 CLEANFILES = \
-	*.gch
+	$(BUILT_SOURCES)
 endif
 
 if DO_UPDATE_MIME_DB
diff --git a/src/sigproc/Makefile.am b/src/sigproc/Makefile.am
index 966bb5c..85be06e 100644
--- a/src/sigproc/Makefile.am
+++ b/src/sigproc/Makefile.am
@@ -18,7 +18,7 @@ BUILT_SOURCES := \
 	sigproc.hh.gch
 %.hh.gch: %.hh
 	$(CXXCOMPILE) -c $<
-CLEANFILES := \
+CLEANFILES = \
 	$(BUILT_SOURCES)
 endif
 

-- 
Sleep experiment manager