[longomatch] Fix makefiles for the migration build dir
- From: Andoni Morales Alastruey <amorales src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [longomatch] Fix makefiles for the migration build dir
- Date: Tue, 14 Oct 2014 15:48:32 +0000 (UTC)
commit 331948e0e0bade1b20e7acbce9ed282ffe409a29
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date: Tue Oct 14 15:32:42 2014 +0200
Fix makefiles for the migration build dir
LongoMatch.Migration/Makefile.am | 2 +-
build/build.environment.mk | 3 +++
build/build.rules.mk | 4 +++-
3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/LongoMatch.Migration/Makefile.am b/LongoMatch.Migration/Makefile.am
index 1bdabac..1e0928b 100644
--- a/LongoMatch.Migration/Makefile.am
+++ b/LongoMatch.Migration/Makefile.am
@@ -1,6 +1,7 @@
ASSEMBLY = LongoMatch
TARGET = exe
INSTALL_DIR = $(pkglibdir)/migration
+BUILD_DIR = bin/migration
LINK = $(REF_DEP_LONGOMATCH_MIGRATION)
@@ -55,4 +56,3 @@ RESOURCES = gtk-gui/gui.stetic \
Data/project.lgm
include $(top_srcdir)/build/build.mk
-ASSEMBLY_FILE := $(top_builddir)/bin/migration/$(ASSEMBLY).$(ASSEMBLY_EXTENSION)
diff --git a/build/build.environment.mk b/build/build.environment.mk
index 1709cec..d63cbff 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -5,6 +5,9 @@ MONO_ADDINS_PATH =
# Install Paths
DEFAULT_INSTALL_DIR = $(pkglibdir)
+# Build Paths
+DEFAULT_BUILD_DIR = bin
+
# External libraries to link against, generated from configure
LINK_SYSTEM = -r:System
LINK_SYSTEM_CORE = -r:System.Core
diff --git a/build/build.rules.mk b/build/build.rules.mk
index eed2a74..ad68685 100644
--- a/build/build.rules.mk
+++ b/build/build.rules.mk
@@ -12,8 +12,10 @@ INSTALL_ICONS = $(top_srcdir)/build/private-icon-theme-installer "$(mkinstalldir
THEME_ICONS_SOURCE = $(wildcard $(srcdir)/ThemeIcons/*/*/*.png) $(wildcard
$(srcdir)/ThemeIcons/scalable/*/*.svg)
THEME_ICONS_RELATIVE = $(subst $(srcdir)/ThemeIcons/, , $(THEME_ICONS_SOURCE))
+BUILD_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_BUILD_DIR), $(BUILD_DIR)))
+
ASSEMBLY_EXTENSION = $(strip $(patsubst library, dll, $(TARGET)))
-ASSEMBLY_FILE = $(top_builddir)/bin/$(ASSEMBLY).$(ASSEMBLY_EXTENSION)
+ASSEMBLY_FILE := $(top_builddir)/$(BUILD_DIR_RESOLVED)/$(ASSEMBLY).$(ASSEMBLY_EXTENSION)
INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR)))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]