[syslinux:firmware] Makefile: Move Makefile.private inclusion to change default target
syslinux-bot for Matt Fleming
matt.fleming at intel.com
Thu Nov 15 11:51:06 PST 2012
Commit-ID: 023cbfcba3a526e5d906616f373e278821e45b1e
Gitweb: http://www.syslinux.org/commit/023cbfcba3a526e5d906616f373e278821e45b1e
Author: Matt Fleming <matt.fleming at intel.com>
AuthorDate: Wed, 14 Nov 2012 11:04:55 +0000
Committer: Matt Fleming <matt.fleming at intel.com>
CommitDate: Wed, 14 Nov 2012 11:04:55 +0000
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 at intel.com>
---
Makefile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index abe7d51..a04f632 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
More information about the Syslinux-commits
mailing list