From ab29a25591070074458a443ddbe681aa3b8310f6 Mon Sep 17 00:00:00 2001
From: Tim Hockin
Date: Fri, 15 Jul 2016 10:27:14 -0700
Subject: [PATCH] Prep to re-commit generated files
---
.gitignore | 3 ++-
Makefile | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6963755c90b69..7b393e8fab6f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,7 +99,8 @@ network_closure.sh
kubernetes.tar.gz
# generated files in any directory
-zz_generated.*
+# TODO(thockin): uncomment this when we stop committing the generated files.
+#zz_generated.*
# make-related metadata
/.make/
diff --git a/Makefile b/Makefile
index 4aa693e01b287..cb23aaa3d55e7 100644
--- a/Makefile
+++ b/Makefile
@@ -181,8 +181,10 @@ test-cmd:
#
# Example:
# make clean
+#
+# TODO(thockin): call clean_generated when we stop committing generated code.
.PHONY: clean
-clean: clean_generated clean_meta
+clean: clean_meta
build/make-clean.sh
rm -rf $(OUT_DIR)
rm -rf Godeps/_workspace # Just until we are sure it is gone