aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-11-14 11:04:55 +0000
committerMatt Fleming <matt.fleming@intel.com>2012-11-14 11:04:55 +0000
commit023cbfcba3a526e5d906616f373e278821e45b1e (patch)
treed79c4c35045a37ec5e1bbb5036c002815e3e51c6 /Makefile
parent4c7278413ef068bd8239fd8a6c69d64bd2c0a385 (diff)
downloadsyslinux-023cbfcba3a526e5d906616f373e278821e45b1e.tar.gz
syslinux-023cbfcba3a526e5d906616f373e278821e45b1e.tar.xz
syslinux-023cbfcba3a526e5d906616f373e278821e45b1e.zip
Makefile: Move Makefile.private inclusion to change default target
If no make target is specified on the command line we'll try to build the first target we encounter in Makefile. Because we include Makefile.private before any targets that means we'll try to build isolinux.iso by default, which probably isn't what the user expected. Move Makefile.private *after* our first target in Makefile so that the user needs to explicitly build the targets in Makefile.private. Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index abe7d51c..a04f6321 100644
--- a/Makefile
+++ b/Makefile
@@ -71,8 +71,6 @@ 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 \
preupload upload
@@ -103,6 +101,9 @@ $(filter-out $(private-targets), $(MAKECMDGOALS)):
$(MAKE) -C $(OBJDIR) -f $(CURDIR)/Makefile SRC="$(topdir)" \
OBJ=$(OBJDIR) objdir=$(OBJDIR) $(MAKECMDGOALS)
+# Hook to add private Makefile targets for the maintainer.
+-include $(topdir)/Makefile.private
+
else # ifeq ($(topdir),)
include $(MAKEDIR)/syslinux.mk