Use '$(MAKE) -C dir' instead of 'cd dir && make' when building in subdirectory

This allow builders to control which make program to use and let make
take care of changing the working directory.
This commit is contained in:
Petter Reinholdtsen 2023-01-20 14:50:30 +00:00
parent cf9ecb80d3
commit 03bc6b9465
2 changed files with 14 additions and 14 deletions

View file

@ -1,22 +1,22 @@
all: protocol opensnitch_daemon gui all: protocol opensnitch_daemon gui
install: install:
@cd daemon && make install @$(MAKE) -C daemon install
@cd ui && make install @$(MAKE) -C ui install
protocol: protocol:
@cd proto && make @$(MAKE) -C proto
opensnitch_daemon: opensnitch_daemon:
@cd daemon && make @$(MAKE) -C daemon
gui: gui:
@cd ui && make @$(MAKE) -C ui
clean: clean:
@cd daemon && make clean @$(MAKE) -C daemon clean
@cd proto && make clean @$(MAKE) -C proto clean
@cd ui && make clean @$(MAKE) -C ui clean
run: run:
cd ui && pip3 install --upgrade . && cd .. cd ui && pip3 install --upgrade . && cd ..
@ -25,18 +25,18 @@ run:
test: test:
clear clear
make clean $(MAKE) clean
clear clear
mkdir -p rules mkdir -p rules
make $(MAKE)
clear clear
make run $(MAKE) run
adblocker: adblocker:
clear clear
make clean $(MAKE) clean
clear clear
make $(MAKE)
clear clear
python make_ads_rules.py python make_ads_rules.py
clear clear

View file

@ -8,7 +8,7 @@ opensnitch/resources_rc.py: translations deps
sed -i 's/^import ui_pb2/from . import ui_pb2/' opensnitch/ui_pb2* sed -i 's/^import ui_pb2/from . import ui_pb2/' opensnitch/ui_pb2*
translations: translations:
@cd i18n ; make @$(MAKE) -C i18n
deps: deps:
@pip3 install -r requirements.txt @pip3 install -r requirements.txt