aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-11-09 15:52:57 +0000
committerMatt Fleming <matt.fleming@intel.com>2012-11-09 16:00:07 +0000
commit02503726109ce50b5cefd165e47ac859925a14f3 (patch)
treed7c708bb83d571cf0b6a11ac47c3b1d71dfb3bf7 /Makefile
parent202a85224c349df0a02f30d2d6b5bf42cda1b662 (diff)
downloadsyslinux-02503726109ce50b5cefd165e47ac859925a14f3.tar.gz
syslinux-02503726109ce50b5cefd165e47ac859925a14f3.tar.xz
syslinux-02503726109ce50b5cefd165e47ac859925a14f3.zip
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@intel.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 9 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index c7a0127f..57068d29 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