[syslinux:firmware] Makefile.private: Update for new per-firmware object directories
syslinux-bot for Matt Fleming
matt.fleming at intel.com
Fri Nov 9 09:06:37 PST 2012
Commit-ID: 02503726109ce50b5cefd165e47ac859925a14f3
Gitweb: http://www.syslinux.org/commit/02503726109ce50b5cefd165e47ac859925a14f3
Author: Matt Fleming <matt.fleming at intel.com>
AuthorDate: Fri, 9 Nov 2012 15:52:57 +0000
Committer: Matt Fleming <matt.fleming at intel.com>
CommitDate: Fri, 9 Nov 2012 16:00:07 +0000
Makefile.private: Update for new per-firmware object directories
Update the exported variables when invoking make in the 'official'
target.
Signed-off-by: Matt Fleming <matt.fleming at intel.com>
---
Makefile | 12 +++++++++---
Makefile.private | 8 ++++----
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index c7a0127..57068d2 100644
--- a/Makefile
+++ b/Makefile
@@ -68,8 +68,13 @@ $(if $(cd-output),, \
MAKEDIR = $(topdir)/mk
export MAKEDIR topdir OBJDIR
+include $(MAKEDIR)/syslinux.mk
-include $(OBJDIR)/version.mk
+# Hook to add private Makefile targets for the maintainer.
+-include $(topdir)/Makefile.private
+private-targets = prerel unprerel official release burn isolinux.iso
+
ifeq ($(MAKECMDGOALS),)
MAKECMDGOALS += all
endif
@@ -92,14 +97,15 @@ ifeq ($(real-firmware),)
real-firmware = $(firmware)
endif
-.PHONY: $(MAKECMDGOALS)
-$(MAKECMDGOALS):
+.PHONY: $(filter-out $(private-targets), $(MAKECMDGOALS))
+$(filter-out $(private-targets), $(MAKECMDGOALS)):
$(MAKE) -C $(OBJDIR) -f $(CURDIR)/Makefile SRC="$(topdir)" \
OBJ=$(OBJDIR) objdir=$(OBJDIR) $(MAKECMDGOALS)
else # ifeq ($(topdir),)
-include $(MAKEDIR)/syslinux.mk
+# Hook to add private Makefile targets for the maintainer.
+-include $(topdir)/Makefile.private
#
# The BTARGET refers to objects that are derived from ldlinux.asm; we
diff --git a/Makefile.private b/Makefile.private
index 92127e9..37dd259 100644
--- a/Makefile.private
+++ b/Makefile.private
@@ -36,10 +36,10 @@ burn: isolinux.iso
cdrecord -v blank=fast isolinux.iso
official:
- $(MAKE) spotless CC='$(CC) -m32'
- $(MAKE) all CC='$(CC) -m32'
- $(MAKE) strip CC='$(CC) -m32'
- $(MAKE) dist CC='$(CC) -m32'
+ $(MAKE) spotless CC='$(CC) -m32' SRC=$(topdir) OBJ=$(CURDIR)
+ $(MAKE) all CC='$(CC) -m32' SRC=$(topdir) OBJ=$(CURDIR)
+ $(MAKE) strip CC='$(CC) -m32' SRC=$(topdir) OBJ=$(CURDIR)
+ $(MAKE) dist CC='$(CC) -m32' SRC=$(topdir) OBJ=$(CURDIR)
release:
test -d release
More information about the Syslinux-commits
mailing list