From 0677a5c7184e33c06e191ddc459667aedcafb658 Mon Sep 17 00:00:00 2001
From: bharnden <bharnden@users.noreply.github.com>
Date: Tue, 26 Mar 2019 08:58:29 -0700
Subject: [PATCH] updated makefiles to build/clean protobuf files

---
 .gitignore               | 1 -
 configure.ac             | 1 +
 daemon/Makefile.am       | 4 +++-
 daemon/proto/Makefile    | 5 -----
 daemon/proto/Makefile.am | 5 +++++
 5 files changed, 9 insertions(+), 7 deletions(-)
 delete mode 100644 daemon/proto/Makefile
 create mode 100644 daemon/proto/Makefile.am

diff --git a/.gitignore b/.gitignore
index 7ff8c547..dbf9e4c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@
 .version.date
 Makefile
 !kernel/**/Makefile
-!daemon/proto/Makefile
 Makefile.in
 aclocal.m4
 autom4te.cache
diff --git a/configure.ac b/configure.ac
index 10c1c245..79c5ecc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -240,6 +240,7 @@ AC_CONFIG_FILES([Makefile
 		daemon/Makefile
 		daemon/doc/Makefile
 		daemon/doc/conf.py
+		daemon/proto/Makefile
 		netns/Makefile
 		netns/version.h
 		ns3/Makefile],)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index a5fe9cb9..769098bb 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -11,9 +11,11 @@ SETUPPY	= setup.py
 SETUPPYFLAGS = -v
 
 if WANT_DOCS
-  SUBDIRS = doc
+  DOCS = doc
 endif
 
+SUBDIRS = proto $(DOCS)
+
 SCRIPT_FILES := $(notdir $(wildcard scripts/*))
 MAN_FILES := $(notdir $(wildcard ../man/*.1))
 
diff --git a/daemon/proto/Makefile b/daemon/proto/Makefile
deleted file mode 100644
index e4edb47a..00000000
--- a/daemon/proto/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all:
-	python -m grpc_tools.protoc -I . --python_out=../core/grpc --grpc_python_out=../core/grpc core.proto
-
-clean:
-	rm core_pb2*
diff --git a/daemon/proto/Makefile.am b/daemon/proto/Makefile.am
new file mode 100644
index 00000000..bcf62a2c
--- /dev/null
+++ b/daemon/proto/Makefile.am
@@ -0,0 +1,5 @@
+all:
+	$(PYTHON) -m grpc_tools.protoc -I . --python_out=../core/grpc --grpc_python_out=../core/grpc core.proto
+
+clean:
+	-rm -f ../core/grpc/core_pb2*