Commit 8ec0bc42 authored by Andrés G. Aragoneses's avatar Andrés G. Aragoneses Committed by Andrés G. Aragoneses

build: refactoring to remove dupe $DLL_MAP_VERIFIER_ASSEMBLY target

After the fix for bgo#691696 landed, the target $DLL_MAP_VERIFIER_ASSEMBLY
is defined in two places. This commits avoids this, by making the Makefile
from the build/ dir include the generic build.rules.mk like other Makefiles
in the build already do.

The only change in this commit that seems to not be related is the move of
the 'if ENABLE_TESTS' block. The reason for it was to avoid this build
failure which would happen if it's not moved:

  Running automake --gnu --add-missing --force --copy -Wno-portability -Wno-portability ...
  build/build.rules.mk:11: LINK must be set with `=' before using `+='

No change of behaviour in this commit.
parent 0ac190b4
......@@ -2,7 +2,6 @@ SUBDIRS = pkg-config m4
GCONF_SCHEMA_EXTRACTOR_ASSEMBLY = gconf-schema-extractor.exe
TRANSLATOR_EXTRACTOR_ASSEMBLY = translator-extractor.exe
DLL_MAP_VERIFIER_ASSEMBLY = dll-map-verifier.exe
ADDIN_XML_STRING_EXTRACTOR_ASSEMBLY = addin-xml-string-extractor.exe
GOBJECT_INTPTR_CTOR_VERIFIER_ASSEMBLY = gobject-intptr-ctor-verifier.exe
......@@ -15,17 +14,12 @@ $(GCONF_SCHEMA_EXTRACTOR_ASSEMBLY): GConfSchemaExtractor.cs
$(MCS) -out:$@ $<
endif
all: $(ALL_TARGETS)
$(TRANSLATOR_EXTRACTOR_ASSEMBLY): TranslatorExtractor.cs
if [ "x$(top_srcdir)" = "x$(top_builddir)" ]; then \
$(MCS) -out:$@ $< && LC_ALL=en_US.UTF-8 $(MONO) $@ $(top_builddir)/po > \
$(top_srcdir)/src/Core/Banshee.Core/Resources/translators.xml; \
fi;
$(DLL_MAP_VERIFIER_ASSEMBLY): DllMapVerifier.cs
$(MCS) -out:$@ $<
$(ADDIN_XML_STRING_EXTRACTOR_ASSEMBLY): AddinXmlStringExtractor.cs
$(MCS) -r:System.Xml -out:$@ $<
......@@ -47,3 +41,4 @@ EXTRA_DIST = \
CLEANFILES = *.exe *.mdb
MAINTAINERCLEANFILES = Makefile.in
include $(top_srcdir)/build/build.rules.mk
include $(top_srcdir)/build/build.environment.mk
ALL_TARGETS = $(ASSEMBLY_FILE) theme-icons
if ENABLE_TESTS
LINK += " $(NUNIT_LIBS)"
ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
endif
include $(top_srcdir)/build/build.dist.mk
include $(top_srcdir)/build/build.rules.mk
include $(top_srcdir)/build/build.dist.mk
UNIQUE_FILTER_PIPE = tr [:space:] \\n | sort | uniq
BUILD_DATA_DIR = $(top_builddir)/bin/share/$(PACKAGE)
......@@ -7,11 +5,6 @@ INSTALL_ICONS = $(top_srcdir)/build/private-icon-theme-installer "$(mkinstalldir
INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR)))
if ENABLE_TESTS
LINK += " $(NUNIT_LIBS)"
ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
endif
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
......@@ -19,7 +12,7 @@ DLL_MAP_VERIFIER_ASSEMBLY = $(top_srcdir)/build/dll-map-verifier.exe
moduledir = $(INSTALL_DIR_RESOLVED)
module_SCRIPTS = $(OUTPUT_FILES)
all: $(ASSEMBLY_FILE) theme-icons
all: $(ALL_TARGETS)
run:
@pushd $(top_builddir); \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment