From 73deef44fa82cbccdc3963a5ff5f694e1549bdeb Mon Sep 17 00:00:00 2001
From: Vas Crabb <vas@vastheman.com>
Date: Mon, 30 Mar 2015 18:29:59 +1100
Subject: [PATCH] Fix UME build, allow custom target to inject stuff in main
 makefile

---
 makefile        | 11 +++++++----
 src/ume/ume.mak | 13 +++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 src/ume/ume.mak

diff --git a/makefile b/makefile
index d83c746d365..472eed81edf 100644
--- a/makefile
+++ b/makefile
@@ -351,10 +351,9 @@ SCRIPTS = scripts/genie.lua \
 	scripts/src/bus.lua \
 	scripts/src/netlist.lua \
 	scripts/toolchain.lua \
-	scripts/target/$(TARGET)/$(SUBTARGET).lua
-ifneq (,$(wildcard src/osd/$(OSD)/$(OSD).mak))
-SCRIPTS+= src/osd/$(OSD)/$(OSD).mak
-endif
+	scripts/target/$(TARGET)/$(SUBTARGET).lua \
+	$(wildcard src/osd/$(OSD)/$(OSD).mak) \
+	$(wildcard src/$(TARGET)/$(SUBTARGET).mak)
 ifdef REGENIE
 SCRIPTS+= regenie
 endif
@@ -721,6 +720,10 @@ ifneq (,$(wildcard src/osd/$(OSD)/$(OSD).mak))
 include src/osd/$(OSD)/$(OSD).mak
 endif
 
+ifneq (,$(wildcard src/$(TARGET)/$(SUBTARGET).mak))
+include src/$(TARGET)/$(SUBTARGET).mak
+endif
+
 $(GEN_FOLDERS):
 	-$(call MKDIR,$@)
 
diff --git a/src/ume/ume.mak b/src/ume/ume.mak
new file mode 100644
index 00000000000..d319b666311
--- /dev/null
+++ b/src/ume/ume.mak
@@ -0,0 +1,13 @@
+###########################################################################
+#
+#   makefile
+#
+#   Additional makefile for building UME
+#
+#   Copyright (c) Nicola Salmoria and the MAME Team.
+#   Visit http://mamedev.org for licensing and usage restrictions.
+#
+###########################################################################
+
+GEN_FOLDERS += $(GENDIR)/mame/layout/ $(GENDIR)/mess/layout/
+LAYOUTS += $(wildcard $(SRC)/mame/layout/*.lay) $(wildcard $(SRC)/mess/layout/*.lay)