diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2015-04-08 14:03:17 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-04-08 14:03:17 -0700 |
| commit | f8808fb608bf7f0065574702ca408f8557235888 (patch) | |
| tree | 664ccde5bb9cb840363df4ab3adf2c1ab00c16d3 /Makefile.am | |
| parent | 4990875f0038da891badcecdd0d974de85ef043b (diff) | |
| parent | 35a1cc7a7c7cfd205641f15258ca991f6d3ec2bc (diff) | |
| download | protobuf-f8808fb608bf7f0065574702ca408f8557235888.tar.gz protobuf-f8808fb608bf7f0065574702ca408f8557235888.tar.bz2 protobuf-f8808fb608bf7f0065574702ca408f8557235888.zip | |
Merge gerrit/master and github/master.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index e7820f2a..3cabcf57 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = . src # Always include gtest in distributions. -DIST_SUBDIRS = $(subdirs) src +DIST_SUBDIRS = $(subdirs) src conformance # Build gtest before we build protobuf tests. We don't add gtest to SUBDIRS # because then "make check" would also build and run all of gtest's own tests, @@ -30,6 +30,10 @@ clean-local: @if test -e gtest/Makefile; then \ echo "Making clean in gtest"; \ cd gtest && $(MAKE) $(AM_MAKEFLAGS) clean; \ + fi; \ + if test -e conformance/Makefile; then \ + echo "Making clean in conformance"; \ + cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \ fi pkgconfigdir = $(libdir)/pkgconfig |