Skip to content

Commit

Permalink
[build] Enabled parallel compilation
Browse files Browse the repository at this point in the history
Recursive make commands should always use the variable MAKE, not the
explicit 'make', to avoid "warning: jobserver unavailable: using -j1"
  • Loading branch information
monich committed Oct 22, 2020
1 parent b3d1954 commit 5eeca17
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion rpm/nfcd.spec
Expand Up @@ -46,7 +46,7 @@ This package contains command line NFC tools.
%setup -q

%build
make LIBDIR=%{_libdir} KEEP_SYMBOLS=1 release pkgconfig
make %{_smp_mflags} LIBDIR=%{_libdir} KEEP_SYMBOLS=1 release pkgconfig

%install
%define target_wants_dir %{_unitdir}/network.target.wants
Expand Down
12 changes: 6 additions & 6 deletions src/Makefile
Expand Up @@ -146,21 +146,21 @@ debug: $(DEBUG_DEPS) $(DEBUG_EXE)
release: $(RELEASE_DEPS) $(RELEASE_EXE)

clean:
make -C $(NFC_CORE_DIR) clean
make -C $(NFC_PLUGINS_DIR) clean
$(MAKE) -C $(NFC_CORE_DIR) clean
$(MAKE) -C $(NFC_PLUGINS_DIR) clean
rm -fr $(BUILD_DIR) $(SRC_DIR)/*~

nfc_core_debug_lib:
make -C $(NFC_CORE_DIR) debug
$(MAKE) -C $(NFC_CORE_DIR) debug

nfc_core_release_lib:
make -C $(NFC_CORE_DIR) release
$(MAKE) -C $(NFC_CORE_DIR) release

nfc_plugins_debug_lib:
make -C $(NFC_PLUGINS_DIR) debug
$(MAKE) -C $(NFC_PLUGINS_DIR) debug

nfc_plugins_release_lib:
make -C $(NFC_PLUGINS_DIR) release
$(MAKE) -C $(NFC_PLUGINS_DIR) release

$(DEBUG_BUILD_DIR):
mkdir -p $@
Expand Down
4 changes: 2 additions & 2 deletions tools/iso-dep/Makefile
Expand Up @@ -115,10 +115,10 @@ clean:
rm -fr $(BUILD_DIR) $(SRC_DIR)/*~

nfc_core_debug_lib:
make -C $(NFC_CORE_DIR) debug
$(MAKE) -C $(NFC_CORE_DIR) debug

nfc_core_release_lib:
make -C $(NFC_CORE_DIR) release
$(MAKE) -C $(NFC_CORE_DIR) release

$(GEN_DIR)/%.c: $(SPEC_DIR)/%.xml
gdbus-codegen --generate-c-code $(@:%.c=%) $<
Expand Down
4 changes: 2 additions & 2 deletions tools/ndef-read/Makefile
Expand Up @@ -138,10 +138,10 @@ clean:
rm -fr $(BUILD_DIR) $(SRC_DIR)/*~

nfc_core_debug_lib:
make -C $(NFC_CORE_DIR) debug
$(MAKE) -C $(NFC_CORE_DIR) debug

nfc_core_release_lib:
make -C $(NFC_CORE_DIR) release
$(MAKE) -C $(NFC_CORE_DIR) release

$(GEN_DIR)/%.c: $(SPEC_DIR)/%.xml
gdbus-codegen --generate-c-code $(@:%.c=%) $<
Expand Down
4 changes: 2 additions & 2 deletions tools/ndef-write/Makefile
Expand Up @@ -139,10 +139,10 @@ clean:
rm -fr $(BUILD_DIR) $(SRC_DIR)/*~

nfc_core_debug_lib:
make -C $(NFC_CORE_DIR) debug
$(MAKE) -C $(NFC_CORE_DIR) debug

nfc_core_release_lib:
make -C $(NFC_CORE_DIR) release
$(MAKE) -C $(NFC_CORE_DIR) release

$(GEN_DIR)/%.c: $(SPEC_DIR)/%.xml
gdbus-codegen --generate-c-code $(@:%.c=%) $<
Expand Down

0 comments on commit 5eeca17

Please sign in to comment.