summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Klozik <martinx.klozik@intel.com>2017-09-08 06:37:38 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-08 06:37:38 +0000
commitb3d4c265ab89fdf83c97b7e66616c91f2cfbee1a (patch)
tree92f40b7e55e9cafa02cd0df51844331338003792
parent1d095d24b5599b965291fa5f6a3734e3bf5e84af (diff)
parent2cfae5e4569bf595e238a4ccb56a6ef5544a3265 (diff)
Merge "trex: fix Trex makefile"
-rw-r--r--.gitignore1
-rw-r--r--src/trex/Makefile3
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 48751193..97dbd7d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,6 +67,7 @@ target/
/src/vpp/vpp/
/src_cuse/
/src_vanilla/
+/src/trex/trex
.vagrant
tags
diff --git a/src/trex/Makefile b/src/trex/Makefile
index 9aaaa203..41eb52ab 100644
--- a/src/trex/Makefile
+++ b/src/trex/Makefile
@@ -26,7 +26,7 @@ TAG_DONE_FLAG = $(WORK_DIR)/.$(TREX_TAG).done
all: force_pull
@echo "Finished pulling $(WORK_DIR) "
-force_pull: $(WORK_DIR) Makefile
+force_pull: $(TAG_DONE_FLAG)
$(AT)cd $(WORK_DIR) && git pull $(TREX_URL) $(TREX_TAG)
@echo "git pull done"
@@ -35,6 +35,7 @@ $(WORK_DIR):
$(TAG_DONE_FLAG): $(WORK_DIR)
$(AT)cd $(WORK_DIR); git checkout $(TREX_TAG)
+ $(AT)touch $@
install:
@echo "Make install in $(WORK_DIR) (stub) "