[syslinux:elflink] elflink: Move elf MCONFIG to mk/elf.mk
syslinux-bot for Matt Fleming
matt.fleming at linux.intel.com
Wed Apr 27 14:30:44 PDT 2011
Commit-ID: bcb23ab9672921bebadba780842b0fd3b3bac574
Gitweb: http://syslinux.zytor.com/commit/bcb23ab9672921bebadba780842b0fd3b3bac574
Author: Matt Fleming <matt.fleming at linux.intel.com>
AuthorDate: Thu, 7 Apr 2011 18:12:51 +0100
Committer: Matt Fleming <matt.fleming at linux.intel.com>
CommitDate: Tue, 26 Apr 2011 09:52:49 +0100
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 at linux.intel.com>
---
com32/elflink/Makefile | 3 ---
com32/elflink/ldlinux/Makefile | 3 ++-
com32/elflink/modules/Makefile | 3 ++-
com32/elflink/modules/MCONFIG => mk/elf.mk | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/com32/elflink/Makefile b/com32/elflink/Makefile
index 39266de..aca3743 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 f960693..6fbe1b1 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 6cd0767..eb2d052 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
similarity index 98%
rename from com32/elflink/modules/MCONFIG
rename to mk/elf.mk
index 0049128..530cd94 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,)
More information about the Syslinux-commits
mailing list