mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

all: Use the MAKE variable

Browse source 
https://www.gnu.org/software/make/manual/html_node/MAKE-Variable.html

We should be using the $(MAKE) variable when calling the make command
from Makefiles since we use Makefile recursion.

Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
This commit is contained in:
Tyler Hicks 2017-11-01 23:04:26 +00:00
parent 29b20fd688
commit 19c6c3310b
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Makefile
View file

@ -40,23 +40,23 @@ TAR_EXCLUSIONS=
.PHONY: tarball .PHONY: tarball
tarball: clean tarball: clean
REPO_VERSION=`$(value REPO_VERSION_CMD)` && \ REPO_VERSION=`$(value REPO_VERSION_CMD)` && \
make export_dir __EXPORT_DIR=${RELEASE_DIR} __REPO_VERSION=$${REPO_VERSION} && \ $(MAKE) export_dir __EXPORT_DIR=${RELEASE_DIR} __REPO_VERSION=$${REPO_VERSION} && \
make setup __SETUP_DIR=${RELEASE_DIR} && \ $(MAKE) setup __SETUP_DIR=${RELEASE_DIR} && \
tar ${TAR_EXCLUSIONS} -cvzf ${RELEASE_DIR}.tar.gz ${RELEASE_DIR} tar ${TAR_EXCLUSIONS} -cvzf ${RELEASE_DIR}.tar.gz ${RELEASE_DIR}
.PHONY: snapshot .PHONY: snapshot
snapshot: clean snapshot: clean
$(eval REPO_VERSION:=$(shell $(value REPO_VERSION_CMD))) $(eval REPO_VERSION:=$(shell $(value REPO_VERSION_CMD)))
$(eval SNAPSHOT_NAME=apparmor-$(VERSION)~$(REPO_VERSION)) $(eval SNAPSHOT_NAME=apparmor-$(VERSION)~$(REPO_VERSION))
make export_dir __EXPORT_DIR=${SNAPSHOT_NAME} __REPO_VERSION=${REPO_VERSION} && \ $(MAKE) export_dir __EXPORT_DIR=${SNAPSHOT_NAME} __REPO_VERSION=${REPO_VERSION} && \
make setup __SETUP_DIR=${SNAPSHOT_NAME} && \ $(MAKE) setup __SETUP_DIR=${SNAPSHOT_NAME} && \
tar ${TAR_EXCLUSIONS} -cvzf ${SNAPSHOT_NAME}.tar.gz ${SNAPSHOT_NAME} tar ${TAR_EXCLUSIONS} -cvzf ${SNAPSHOT_NAME}.tar.gz ${SNAPSHOT_NAME}
.PHONY: coverity .PHONY: coverity
coverity: snapshot coverity: snapshot
cd $(SNAPSHOT_NAME)/libraries/libapparmor && ./configure --with-python cd $(SNAPSHOT_NAME)/libraries/libapparmor && ./configure --with-python
$(foreach dir, $(filter-out utils profiles tests, $(DIRS)), \ $(foreach dir, $(filter-out utils profiles tests, $(DIRS)), \
cov-build --dir $(COVERITY_DIR) -- make -C $(SNAPSHOT_NAME)/$(dir);) cov-build --dir $(COVERITY_DIR) -- $(MAKE) -C $(SNAPSHOT_NAME)/$(dir);)
tar -cvzf $(SNAPSHOT_NAME)-$(COVERITY_DIR).tar.gz $(COVERITY_DIR) tar -cvzf $(SNAPSHOT_NAME)-$(COVERITY_DIR).tar.gz $(COVERITY_DIR)
.PHONY: export_dir .PHONY: export_dir
@ -69,18 +69,18 @@ export_dir:
clean: clean:
-rm -rf ${RELEASE_DIR} ./apparmor-${VERSION}~* ${COVERITY_DIR} -rm -rf ${RELEASE_DIR} ./apparmor-${VERSION}~* ${COVERITY_DIR}
for dir in $(DIRS); do \ for dir in $(DIRS); do \
make -C $$dir clean; \ $(MAKE) -C $$dir clean; \
done done
.PHONY: setup .PHONY: setup
setup: setup:
cd $(__SETUP_DIR)/libraries/libapparmor && ./autogen.sh cd $(__SETUP_DIR)/libraries/libapparmor && ./autogen.sh
# parser has an extra doc to build # parser has an extra doc to build
make -C $(__SETUP_DIR)/parser extra_docs $(MAKE) -C $(__SETUP_DIR)/parser extra_docs
# libraries/libapparmor needs configure to have run before # libraries/libapparmor needs configure to have run before
# building docs # building docs
$(foreach dir, $(filter-out libraries/libapparmor tests, $(DIRS)), \ $(foreach dir, $(filter-out libraries/libapparmor tests, $(DIRS)), \
make -C $(__SETUP_DIR)/$(dir) docs;) $(MAKE) -C $(__SETUP_DIR)/$(dir) docs;)
.PHONY: tag .PHONY: tag
tag: tag:

2
changehat/mod_apparmor/Makefile
View file

@ -87,7 +87,7 @@ docs: ${MANPAGES} ${HTMLMANPAGES}
install: ${TARGET} ${MANPAGES} install: ${TARGET} ${MANPAGES}
mkdir -p ${DESTDIR}/${APXS_INSTALL_DIR} mkdir -p ${DESTDIR}/${APXS_INSTALL_DIR}
install -m 755 $< ${DESTDIR}/${APXS_INSTALL_DIR} install -m 755 $< ${DESTDIR}/${APXS_INSTALL_DIR}
make install_manpages DESTDIR=${DESTDIR} $(MAKE) install_manpages DESTDIR=${DESTDIR}
.PHONY: clean .PHONY: clean
clean: pod_clean clean: pod_clean

2
parser/tst/Makefile
View file

@ -57,7 +57,7 @@ valgrind: $(PARSER) gen_xtrans gen_dbus
LANG=C ./valgrind_simple.py -p "$(PARSER)" -v simple_tests LANG=C ./valgrind_simple.py -p "$(PARSER)" -v simple_tests
$(PARSER): $(PARSER):
make -C $(PARSER_DIR) $(PARSER_BIN) $(MAKE) -C $(PARSER_DIR) $(PARSER_BIN)
clean: clean:
find $(GEN_TRANS_DIRS) -type f | xargs rm -f find $(GEN_TRANS_DIRS) -type f | xargs rm -f

2
tests/Makefile
View file

@ -3,5 +3,5 @@ SUBDIRS=regression stress
.PHONY: clean .PHONY: clean
clean: clean:
for dir in $(SUBDIRS) ; do \ for dir in $(SUBDIRS) ; do \
make clean -C $${dir} ; \ $(MAKE) clean -C $${dir} ; \
done done

2
tests/regression/Makefile
View file

@ -3,5 +3,5 @@ SUBDIRS=apparmor
.PHONY: clean .PHONY: clean
clean: clean:
for dir in $(SUBDIRS) ; do \ for dir in $(SUBDIRS) ; do \
make clean -C $${dir} ; \ $(MAKE) clean -C $${dir} ; \
done done

2
tests/stress/Makefile
View file

@ -3,5 +3,5 @@ SUBDIRS=subdomain
.PHONY: clean .PHONY: clean
clean: clean:
for dir in $(SUBDIRS) ; do \ for dir in $(SUBDIRS) ; do \
make clean -C $${dir} ; \ $(MAKE) clean -C $${dir} ; \
done done