[longomatch] Clean .config files properly in dist clean
- From: Andoni Morales Alastruey <amorales src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [longomatch] Clean .config files properly in dist clean
- Date: Sun, 29 May 2011 12:10:25 +0000 (UTC)
commit 03406d5e9575585b6492dbf90aed747c3c835016
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date: Sun May 29 14:09:10 2011 +0200
Clean .config files properly in dist clean
CesarPlayer/Makefile.am | 4 +++-
build/build.rules.mk | 5 ++++-
build/dll-map-makefile-verifier | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/CesarPlayer/Makefile.am b/CesarPlayer/Makefile.am
index 2801e85..843f85f 100644
--- a/CesarPlayer/Makefile.am
+++ b/CesarPlayer/Makefile.am
@@ -42,8 +42,10 @@ RESOURCES = \
gtk-gui/objects.xml \
gtk-gui/gui.stetic
+DLLCONFIG = CesarPlayer.dll.config
+
include $(top_srcdir)/build/build.mk
EXTRA_DIST += CesarPlayer.dll.config \
AssemblyInfo.cs.in
-module_SCRIPTS += CesarPlayer.dll.config
+
diff --git a/build/build.rules.mk b/build/build.rules.mk
index 7c02a8c..716257a 100644
--- a/build/build.rules.mk
+++ b/build/build.rules.mk
@@ -15,6 +15,8 @@ THEME_ICONS_RELATIVE = $(subst $(srcdir)/ThemeIcons/, , $(THEME_ICONS_SOURCE))
ASSEMBLY_EXTENSION = $(strip $(patsubst library, dll, $(TARGET)))
ASSEMBLY_FILE = $(top_builddir)/bin/$(ASSEMBLY).$(ASSEMBLY_EXTENSION)
+DLLCONFIG_FILE = $(top_builddir)/bin/$(DLLCONFIG)
+
INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR)))
if ENABLE_TESTS
@@ -27,7 +29,8 @@ DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep
OUTPUT_FILES = \
$(ASSEMBLY_FILE) \
- $(ASSEMBLY_FILE).mdb
+ $(ASSEMBLY_FILE).mdb \
+ $(DLLCONFIG_FILE)
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
diff --git a/build/dll-map-makefile-verifier b/build/dll-map-makefile-verifier
index c75afa5..092938d 100755
--- a/build/dll-map-makefile-verifier
+++ b/build/dll-map-makefile-verifier
@@ -2,7 +2,7 @@
if [ -f $2 ]; then
# Lame, but better than nothing
- grep $(basename $2) $1 | grep module_SCRIPTS &>/dev/null || {
+ grep $(basename $2) $1 | grep DLLCONFIG &>/dev/null || {
echo "Assembly has corresponding .config file, but it was not found in module_SCRIPTS in Makefile.am" 2>&1
exit 1
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]