Browse Source

- rename ni-git targets to ni-sources

master
vanhofen 6 years ago
parent
commit
0df078d378
  1. 11
      make/prerequisites.mk
  2. 10
      make/update.mk

11
make/prerequisites.mk

@ -13,7 +13,7 @@ TOOLCHECK += find-yacc find-flex find-tic find-pkg-config find-help2man
TOOLCHECK += find-cmake find-ccache find-autopoint find-python find-curl
TOOLCHECK += find-lzma find-gperf find-gettext find-bc
preqs: download ni-git
preqs: download ni-sources
$(CCACHE):
@make line
@ -29,8 +29,10 @@ download:
@make line
@false
$(SOURCE_DIR):
mkdir -p $@
$(SOURCE_DIR)/$(NI_NEUTRINO):
mkdir -p $(SOURCE_DIR)
cd $(SOURCE_DIR) && \
git clone $(NI_GIT)/$(notdir $@).git
pushd $@ && \
@ -175,13 +177,12 @@ patches-info:
find-%:
@TOOL=$(patsubst find-%,%,$@); \
type -p $$TOOL >/dev/null || \
{ echo "required tool $$TOOL missing."; false; }
type -p $$TOOL >/dev/null || { echo "required tool $$TOOL missing."; false; }
toolcheck: $(TOOLCHECK)
@echo "All required tools seem to be installed."
ni-git: \
ni-sources: $(SOURCE_DIR) \
$(BUILD-GENERIC-PC) \
$(SOURCE_DIR)/$(NI_DRIVERS-BIN) \
$(SOURCE_DIR)/$(NI_FFMPEG) \

10
make/update.mk

@ -45,10 +45,10 @@ endif
update-ni-force:
#rm -rf $(SOURCE_DIR)/$(NI_LINUX-KERNEL)
rm -rf $(SOURCE_DIR)/$(NI_FFMPEG)
make ni-git
make update-ni-git
make ni-sources
make update-ni-sources
update-ni-git: ni-git
update-ni-sources: ni-sources
cd $(BUILD-GENERIC-PC) && git pull
cd $(SOURCE_DIR)/$(NI_DRIVERS-BIN) && git pull
cd $(SOURCE_DIR)/$(NI_FFMPEG) && git pull --all && git checkout $(NI_FFMPEG_BRANCH)
@ -68,7 +68,7 @@ endif
update-ni:
make update-self
make update-neutrino
make update-ni-git
make update-ni-sources
update-all: update-ni update-remotes
@ -100,7 +100,7 @@ PHONY += update-self
PHONY += update-neutrino
PHONY += update-remotes
PHONY += update-ni-force
PHONY += update-ni-git
PHONY += update-ni-sources
PHONY += update-ni
PHONY += update-all
PHONY += push

Loading…
Cancel
Save