aboutsummaryrefslogtreecommitdiffstats
path: root/com32/rosh
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@linux.intel.com>2011-04-07 17:12:08 +0100
committerMatt Fleming <matt.fleming@linux.intel.com>2011-04-07 17:59:11 +0100
commitd7e6cfaa6a990eb8fe2eaabe7fad1d1c8367a7ee (patch)
treebc682bbbae1ec577e2763386a476a99b1fbee255 /com32/rosh
parent868c474546ba68e9e448734e1833f873fd50ec0a (diff)
downloadsyslinux-d7e6cfaa6a990eb8fe2eaabe7fad1d1c8367a7ee.tar.gz
syslinux-d7e6cfaa6a990eb8fe2eaabe7fad1d1c8367a7ee.tar.xz
syslinux-d7e6cfaa6a990eb8fe2eaabe7fad1d1c8367a7ee.zip
Makefile: Move Makefile fragments into mk/
Move the MCONFIG files into a mk/ directory and give them more descriptive names. This is purely a cosmetic change to make the 'include' directives a bit more coherent by making it obvious exactly which MCONFIG file we're including. For example, in com32/lua/src/Makefile we exchange the line, include ../../MCONFIG for the much more comprehensible, include $(MAKEDIR)/com32.mk Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
Diffstat (limited to 'com32/rosh')
-rw-r--r--com32/rosh/MCONFIG27
-rw-r--r--com32/rosh/Makefile3
2 files changed, 2 insertions, 28 deletions
diff --git a/com32/rosh/MCONFIG b/com32/rosh/MCONFIG
deleted file mode 100644
index 25c41396..00000000
--- a/com32/rosh/MCONFIG
+++ /dev/null
@@ -1,27 +0,0 @@
-## -*- makefile -*- -------------------------------------------------------
-##
-## Copyright 2008 H. Peter Anvin - All Rights Reserved
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-## Boston MA 02110-1301, USA; either version 2 of the License, or
-## (at your option) any later version; incorporated herein by reference.
-##
-## -----------------------------------------------------------------------
-
-##
-## COM32 GRC configurables
-##
-
-## Include the COM32 common configurables
-include ../MCONFIG
-
-# CFLAGS = $(GCCOPT) $(GCCWARN) -march=i386 \
-# -fomit-frame-pointer -D__COM32__ \
-# -nostdinc -iwithprefix include \
-# -I$(com32)/libutil/include -I$(com32)/include
-# -g3 -dD
-
-# LNXCFLAGS = -I$(com32)/libutil/include $(GCCWARN) -O -g3 -D_GNU_SOURCE -dD
-# -U__GNUC__
diff --git a/com32/rosh/Makefile b/com32/rosh/Makefile
index f4b7d866..766f68d5 100644
--- a/com32/rosh/Makefile
+++ b/com32/rosh/Makefile
@@ -17,7 +17,8 @@
##
topdir = ../..
-include MCONFIG
+MAKEDIR = $(topdir)/mk
+include $(MAKEDIR)/rosh.mk
# from com32/sysdump/Makefile
# The DATE is set on the make command line when building binaries for