From: Matt Fleming Date: Thu, 7 Apr 2011 17:12:51 +0000 (+0100) Subject: elflink: Move elf MCONFIG to mk/elf.mk X-Git-Tag: syslinux-5.00-pre1~71 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bcb23ab9672921bebadba780842b0fd3b3bac574;p=platform%2Fupstream%2Fsyslinux.git 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 --- 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,)