From e7128f626356098080a85ccd9b4a9467452616dd Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 24 Jun 2015 21:26:29 -0400 Subject: [PATCH] * nextstep/Makefile.in (all): Make it the first target. (../src/emacs${EXEEXT}): Add rule for making it. --- nextstep/Makefile.in | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in index 2b7933c12a..04d87d889d 100644 --- a/nextstep/Makefile.in +++ b/nextstep/Makefile.in @@ -33,11 +33,20 @@ top_srcdir_abs = $(shell cd @top_srcdir@; pwd -P) @SET_MAKE@ MKDIR_P = @MKDIR_P@ +## Emacs.app. ns_appdir = @ns_appdir@ +## GNUstep: ns_appdir; OS X: ns_appdir/Contents/MacOS ns_appbindir = @ns_appbindir@ +## GNUstep/Emacs.base or Cocoa/Emacs.base. ns_appsrc = @ns_appsrc@ +## GNUstep: GNUstep/Emacs.base/Resources/Info-gnustep.plist +## OS X: Cocoa/Emacs.base/Contents/Info.plist ns_check_file = @ns_appdir@/@ns_check_file@ +.PHONY: all + +all: ${ns_appdir} ${ns_appbindir}/Emacs + ${ns_check_file} ${ns_appdir}: ${srcdir}/${ns_appsrc} ${ns_appsrc} rm -rf ${ns_appdir} ${MKDIR_P} ${ns_appdir} @@ -55,13 +64,16 @@ ${ns_appbindir}/Emacs: ${ns_appdir} ${ns_check_file} ../src/emacs${EXEEXT} ${MKDIR_P} ${ns_appbindir} cp -f ../src/emacs${EXEEXT} $@ -.PHONY: all links +.PHONY: FORCE -all: ${ns_appdir} ${ns_appbindir}/Emacs +../src/emacs${EXEEXT}: FORCE + ${MAKE} -C ../src $(notdir $@) # create a fake installation pointing back to the source tree # to run GUI Emacs in-place -links : ../src/emacs${EXEEXT} +.PHONY: links + +links: ../src/emacs${EXEEXT} for d in $(shell cd ${srcdir}/${ns_appsrc}; find . -type d); do ${MKDIR_P} ${ns_appdir}/$$d; done for f in $(shell cd ${srcdir}/${ns_appsrc}; find . -type f); do ln -s $(shell cd ${srcdir}; pwd -P)/${ns_appsrc}/$$f ${ns_appdir}/$$f; done for d in $(shell cd ${ns_appsrc}; find . -type d); do ${MKDIR_P} ${ns_appdir}/$$d; done -- 2.39.2