Fixed #105: using $(MAKE)

This commit is contained in:
Devaev Maxim
2021-04-06 23:43:32 +03:00
parent 7ea81fa627
commit 62dc2e5ad5

View File

@@ -25,27 +25,27 @@ endef
# ===== # =====
all: all:
+ make apps + $(MAKE) apps
ifneq ($(call optbool,$(WITH_PYTHON)),) ifneq ($(call optbool,$(WITH_PYTHON)),)
+ make python + $(MAKE) python
endif endif
apps: apps:
make -C src $(MAKE) -C src
@ ln -sf src/ustreamer.bin ustreamer @ ln -sf src/ustreamer.bin ustreamer
@ ln -sf src/ustreamer-dump.bin ustreamer-dump @ ln -sf src/ustreamer-dump.bin ustreamer-dump
python: python:
make -C python $(MAKE) -C python
@ ln -sf python/build/lib.*/*.so . @ ln -sf python/build/lib.*/*.so .
install: all install: all
make -C src install $(MAKE) -C src install
ifneq ($(call optbool,$(WITH_PYTHON)),) ifneq ($(call optbool,$(WITH_PYTHON)),)
make -C python install $(MAKE) -C python install
endif endif
mkdir -p $(DESTDIR)$(MANPREFIX)/man1 mkdir -p $(DESTDIR)$(MANPREFIX)/man1
for man in $(shell ls man); do \ for man in $(shell ls man); do \
@@ -55,21 +55,21 @@ endif
install-strip: install install-strip: install
make -C src install-strip $(MAKE) -C src install-strip
regen: regen:
tools/make-jpeg-h.py src/ustreamer/data/blank.jpeg src/ustreamer/data/blank_jpeg.c BLANK tools/$(MAKE)-jpeg-h.py src/ustreamer/data/blank.jpeg src/ustreamer/data/blank_jpeg.c BLANK
tools/make-html-h.py src/ustreamer/data/index.html src/ustreamer/data/index_html.c INDEX tools/$(MAKE)-html-h.py src/ustreamer/data/index.html src/ustreamer/data/index_html.c INDEX
release: release:
make clean $(MAKE) clean
make tox $(MAKE) tox
make push $(MAKE) push
make bump V=$(V) $(MAKE) bump V=$(V)
make push $(MAKE) push
make clean $(MAKE) clean
tox: linters tox: linters
@@ -108,8 +108,8 @@ clean-all: linters clean
clean: clean:
rm -rf pkg/arch/pkg pkg/arch/src pkg/arch/v*.tar.gz pkg/arch/ustreamer-*.pkg.tar.{xz,zst} rm -rf pkg/arch/pkg pkg/arch/src pkg/arch/v*.tar.gz pkg/arch/ustreamer-*.pkg.tar.{xz,zst}
rm -f ustreamer ustreamer-dump *.so rm -f ustreamer ustreamer-dump *.so
make -C src clean $(MAKE) -C src clean
make -C python clean $(MAKE) -C python clean
.PHONY: python linters .PHONY: python linters