aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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,)