aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@linux.intel.com>2011-04-07 18:12:51 +0100
committerMatt Fleming <matt.fleming@linux.intel.com>2011-04-26 09:52:49 +0100
commitbcb23ab9672921bebadba780842b0fd3b3bac574 (patch)
tree06b007afea23126ce2436a7ed2ca5f53ee24c278
parent59b801792c05d7b7f95b72c76924bb6e03321545 (diff)
downloadsyslinux-bcb23ab9672921bebadba780842b0fd3b3bac574.tar.gz
syslinux-bcb23ab9672921bebadba780842b0fd3b3bac574.tar.xz
syslinux-bcb23ab9672921bebadba780842b0fd3b3bac574.zip
elflink: Move elf MCONFIG to mk/elf.mk
Catch up with recent changes to the Makefile fragments in the MCONFIG files. Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
-rw-r--r--com32/elflink/Makefile3
-rw-r--r--com32/elflink/ldlinux/Makefile3
-rw-r--r--com32/elflink/modules/Makefile3
-rw-r--r--mk/elf.mk (renamed from com32/elflink/modules/MCONFIG)2
4 files changed, 5 insertions, 6 deletions
diff --git a/com32/elflink/Makefile b/com32/elflink/Makefile
index 39266ded..aca37438 100644
--- a/com32/elflink/Makefile
+++ b/com32/elflink/Makefile
@@ -10,9 +10,6 @@
##
## -----------------------------------------------------------------------
-topdir = ../..
-include ../MCONFIG
-
MODULES =
TESTFILES =
diff --git a/com32/elflink/ldlinux/Makefile b/com32/elflink/ldlinux/Makefile
index f9606934..6fbe1b16 100644
--- a/com32/elflink/ldlinux/Makefile
+++ b/com32/elflink/ldlinux/Makefile
@@ -11,7 +11,8 @@
## -----------------------------------------------------------------------
topdir = ../../..
-include ../modules/MCONFIG
+MAKEDIR = $(topdir)/mk
+include $(MAKEDIR)/elf.mk
CFLAGS += -I../modules -I$(topdir)/core/elflink -I$(topdir)/core/include
diff --git a/com32/elflink/modules/Makefile b/com32/elflink/modules/Makefile
index 6cd0767f..eb2d052f 100644
--- a/com32/elflink/modules/Makefile
+++ b/com32/elflink/modules/Makefile
@@ -11,7 +11,8 @@
## -----------------------------------------------------------------------
topdir = ../../..
-include MCONFIG
+MAKEDIR = $(topdir)/mk
+include $(MAKEDIR)/elf.mk
CFLAGS += -I$(topdir)/core/elflink
diff --git a/com32/elflink/modules/MCONFIG b/mk/elf.mk
index 0049128e..530cd942 100644
--- a/com32/elflink/modules/MCONFIG
+++ b/mk/elf.mk
@@ -14,7 +14,7 @@
## COM32 common configurables
##
-include $(topdir)/MCONFIG
+include $(MAKEDIR)/syslinux.mk
GCCOPT := $(call gcc_ok,-std=gnu99,)
GCCOPT += $(call gcc_ok,-m32,)