[banshee] build: cosmetic touches to avoid long lines and duplication
- From: Andrés Aragoneses <aaragoneses src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] build: cosmetic touches to avoid long lines and duplication
- Date: Sun, 9 Aug 2015 14:21:08 +0000 (UTC)
commit 9878bf03770e6b509103ba0ba270ce363c74ec45
Author: Andrés G. Aragoneses <knocte gmail com>
Date: Sun Aug 9 16:20:11 2015 +0200
build: cosmetic touches to avoid long lines and duplication
This doesn't change behaviour.
build/Makefile.am | 6 +++++-
build/build.rules.mk | 16 ++++++++++++++--
2 files changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/build/Makefile.am b/build/Makefile.am
index 2eea957..ee7c606 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -5,7 +5,11 @@ TRANSLATOR_EXTRACTOR_ASSEMBLY = translator-extractor.exe
ADDIN_XML_STRING_EXTRACTOR_ASSEMBLY = addin-xml-string-extractor.exe
GOBJECT_INTPTR_CTOR_VERIFIER_ASSEMBLY = gobject-intptr-ctor-verifier.exe
-ALL_TARGETS = $(TRANSLATOR_EXTRACTOR_ASSEMBLY) $(DLL_MAP_VERIFIER_ASSEMBLY)
$(ADDIN_XML_STRING_EXTRACTOR_ASSEMBLY) $(GOBJECT_INTPTR_CTOR_VERIFIER_ASSEMBLY)
+ALL_TARGETS = \
+ $(TRANSLATOR_EXTRACTOR_ASSEMBLY) \
+ $(DLL_MAP_VERIFIER_ASSEMBLY) \
+ $(ADDIN_XML_STRING_EXTRACTOR_ASSEMBLY) \
+ $(GOBJECT_INTPTR_CTOR_VERIFIER_ASSEMBLY)
if GCONF_SCHEMAS_INSTALL
bansheedir = $(pkglibdir)
diff --git a/build/build.rules.mk b/build/build.rules.mk
index ef34f45..f61180d 100644
--- a/build/build.rules.mk
+++ b/build/build.rules.mk
@@ -7,7 +7,8 @@ INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_D
FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
-DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
+DLL_MAP_VERIFIER_ASSEMBLY_NAME = dll-map-verifier.exe
+DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/$(DLL_MAP_VERIFIER_ASSEMBLY_NAME)
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
@@ -36,7 +37,18 @@ $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_V
@mkdir -p $(top_builddir)/bin
@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $
config) && \
- $(MONO) $(top_builddir)/build/dll-map-verifier.exe $(srcdir)/$(notdir $ config) -iwinmm
-ilibbanshee -ilibbnpx11 -ilibc -ilibc.so.6 -iintl -ilibmtp.dll -ilibgtkmacintegration-gtk3.dylib -iCFRelease
$(SOURCES_BUILD); \
+ $(MONO) $(top_builddir)/build/$(DLL_MAP_VERIFIER_ASSEMBLY_NAME) \
+ $(srcdir)/$(notdir $ config) \
+ -iwinmm \
+ -ilibbanshee \
+ -ilibbnpx11 \
+ -ilibc \
+ -ilibc.so.6 \
+ -iintl \
+ -ilibmtp.dll \
+ -ilibgtkmacintegration-gtk3.dylib \
+ -iCFRelease
+ $(SOURCES_BUILD); \
fi;
$(MCS) \
$(MCS_FLAGS) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]