summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2020-08-31 11:23:06 -0500
committerGitHub <noreply@github.com>2020-08-31 11:23:06 -0500
commit621fcb078abb53888e995a007fb9ea31e95e34ab (patch)
treea4dda1096a267fed41ac90121ab6233e5b8b7d39 /Makefile
parentbd076f694a763991a0b0d3a7bb0fa5d194d56d7c (diff)
parentad69fb36201ee0930b76d80f0869284e26846991 (diff)
downloadvyos-1x-621fcb078abb53888e995a007fb9ea31e95e34ab.tar.gz
vyos-1x-621fcb078abb53888e995a007fb9ea31e95e34ab.zip
Merge pull request #535 from jestabro/vyos-configd
configd: T2582: vyos config script daemon configd: T2582: add scripts to include list for daemon configd: T2808: add smoketest to ensure script consistency with daemon configd: T2582: add utility to safely add/remove items from include file configd: T2582: add shim var to node.def configd: T2582: inject shim env variable into configsession configd: T2582: add shim as config daemon client configd: T2582: add mkjson for use by shim configd: T2582: add config daemon and supporting files
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 9 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5b7e4da63..e85835eec 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,9 @@ TMPL_DIR := templates-cfg
OP_TMPL_DIR := templates-op
BUILD_DIR := build
DATA_DIR := data
+SHIM_DIR := src/shim
+CC := gcc
+LIBS := -lzmq
CFLAGS :=
src = $(wildcard interface-definitions/*.xml.in)
@@ -114,14 +117,19 @@ op_mode_definitions:
component_versions: $(BUILD_DIR) $(obj)
$(CURDIR)/scripts/build-component-versions $(BUILD_DIR)/interface-definitions $(DATA_DIR)
+.PHONY: vyshim
+vyshim:
+ $(MAKE) -C $(SHIM_DIR)
+
.PHONY: all
-all: clean interface_definitions op_mode_definitions component_versions
+all: clean interface_definitions op_mode_definitions component_versions vyshim
.PHONY: clean
clean:
rm -rf $(BUILD_DIR)
rm -rf $(TMPL_DIR)
rm -rf $(OP_TMPL_DIR)
+ $(MAKE) -C $(SHIM_DIR) clean
.PHONY: test
test: