aboutsummaryrefslogtreecommitdiffstats
path: root/diag
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2011-04-26 01:18:18 -0700
committerH. Peter Anvin <hpa@zytor.com>2011-04-26 01:18:18 -0700
commitd5b9f24567a26562ec1822235cbd08256b96c335 (patch)
tree8e5a4c6245652d9b610c6308d3f505cdf9292919 /diag
parentfaf815967c276bab95989d22a62b8378d7ebf6f3 (diff)
parent5b726ddd81fd77947e126b14c84fb843b63544c5 (diff)
downloadsyslinux-d5b9f24567a26562ec1822235cbd08256b96c335.tar.gz
syslinux-d5b9f24567a26562ec1822235cbd08256b96c335.tar.xz
syslinux-d5b9f24567a26562ec1822235cbd08256b96c335.zip
Merge remote-tracking branch 'mfleming/for-hpa/makefile-cleanup'
Resolved Conflicts: com32/hdt/Makefile com32/sysdump/Makefile Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'diag')
-rw-r--r--diag/geodsp/Makefile2
-rw-r--r--diag/mbr/Makefile3
2 files changed, 3 insertions, 2 deletions
diff --git a/diag/geodsp/Makefile b/diag/geodsp/Makefile
index 44002bb4..b76eb77d 100644
--- a/diag/geodsp/Makefile
+++ b/diag/geodsp/Makefile
@@ -19,7 +19,7 @@
#
topdir = ../..
-# include $(topdir)/MCONFIG.embedded
+# include $(topdir)/mk/embedded.mk
coredir = $(topdir)/core
BTARGET = geodsp1s.bin geodspms.bin \
diff --git a/diag/mbr/Makefile b/diag/mbr/Makefile
index a94253af..79ff9f01 100644
--- a/diag/mbr/Makefile
+++ b/diag/mbr/Makefile
@@ -17,7 +17,8 @@
topdir = ../..
mbrdir = $(topdir)/mbr
-include $(topdir)/MCONFIG.embedded
+MAKEDIR = $(topdir)/mk
+include $(MAKEDIR)/embedded.mk
all: handoff.bin