aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Thomas Van Lenten <thomasvl@google.com>2015-12-10 15:39:03 -0500
committerGravatar Thomas Van Lenten <thomasvl@google.com>2015-12-10 15:39:03 -0500
commit2f2da0702db0aab16f473a86b28de854e5740295 (patch)
tree504e3a447bc28681da89c676e37abe85d50ee66e
parent014b9012d32c6409bf2f4f13ff4608a2cbc7cb9a (diff)
parenta20d0b6cd458abc164915ceb672448a79261deae (diff)
Merge pull request #1039 from thomasvl/fix_cleans
Fix distclean and maintainer-clean to get more generated files.
-rw-r--r--Makefile.am1
-rw-r--r--conformance/Makefile.am1
2 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 8657f821..bb735177 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -682,6 +682,7 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \
# Deletes all the files generated by autogen.sh.
MAINTAINERCLEANFILES = \
aclocal.m4 \
+ ar-lib \
config.guess \
config.sub \
configure \
diff --git a/conformance/Makefile.am b/conformance/Makefile.am
index 0e76b16a..1c022270 100644
--- a/conformance/Makefile.am
+++ b/conformance/Makefile.am
@@ -10,6 +10,7 @@ protoc_outputs = \
other_language_protoc_outputs = \
conformance.rb \
com/google/protobuf/conformance/Conformance.java \
+ conformance_pb2.py \
Conformance.pbobjc.h \
Conformance.pbobjc.m