js/buildsys
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make use of -include again

Browse source 
OpenBSD make supports it now, so there's no need anymore to touch empty
deps files.
This commit is contained in:
Jonathan Schleifer 2020-02-19 00:52:12 +01:00
parent 8a66174c54
commit 59839af13c
No known key found for this signature in database
GPG key ID: E2BCCE6B35E1AF8B
2 changed files with 4 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

13
buildsys.mk.in
View file

@ -123,7 +123,7 @@ MO_FILES = ${LOCALES:.po=.mo}
.SILENT: .SILENT:
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .amigalib.dep .amigalib.o .beam .c .cc .class .cxx .d .dep .erl .lib.dep .lib.o .java .mo .m .mm .o .plugin.dep .plugin.o .po .py .pyc .rc .S .xpm .SUFFIXES: .amigalib.o .beam .c .cc .class .cxx .d .erl .lib.o .java .mo .m .mm .o .plugin.o .po .py .pyc .rc .S .xpm
.PHONY: all subdirs subdirs-after pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales copy-headers-into-framework ${SUBDIRS} ${SUBDIRS_AFTER} .PHONY: all subdirs subdirs-after pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales copy-headers-into-framework ${SUBDIRS} ${SUBDIRS_AFTER}
all: all:
@ -146,17 +146,12 @@ ${SUBDIRS} ${SUBDIRS_AFTER}:
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
depend: pre-depend .deps depend: pre-depend
.deps: ${DEPS}
: >.deps : >.deps
for i in ${DEPS}; do \ for i in ${DEPS}; do \
echo "include \$${.CURDIR}/$$i" >>.deps; \ echo "-include \$${.CURDIR}/$$i" >>.deps; \
done done
.c.dep .c.lib.dep .c.amigalib.dep .c.plugin.dep .cc.dep .cc.lib.dep .cc.amigalib.dep .cc.plugin.dep .cxx.dep .cxx.lib.dep .cxx.amigalib.dep .cxx.plugin.dep .m.dep .m.lib.dep .m.amigalib.dep .m.plugin.dep .mm.dep .mm.lib.dep .mm.amigalib.dep .mm.plugin.dep .S.dep .S.lib.dep .S.amigalib.dep .S.plugin.dep: pre-depend
touch $@
pre-depend: pre-depend:
${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA} ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
@ -918,4 +913,4 @@ DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_BOLD@%s@TERM_SGR0@@TERM_
DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err
.CURDIR ?= . .CURDIR ?= .
include ${.CURDIR}/.deps -include ${.CURDIR}/.deps

9
m4/buildsys.m4
View file

@ -108,15 +108,6 @@ AC_DEFUN([BUILDSYS_INIT], [
fi fi
]) ])
]) ])
AC_CONFIG_COMMANDS_POST([
${as_echo:="echo"} ${as_me:="configure"}": touching .deps files"
for i in $(find . -name Makefile); do
DEPSFILE="$(dirname $i)/.deps"
test -f "$DEPSFILE" && rm "$DEPSFILE"
touch -t 0001010000 "$DEPSFILE"
done
])
]) ])
AC_DEFUN([BUILDSYS_CHECK_IOS], [ AC_DEFUN([BUILDSYS_CHECK_IOS], [