diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2015-04-01 17:23:48 -0700 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2015-04-08 13:14:10 -0700 |
| commit | 35a1cc7a7c7cfd205641f15258ca991f6d3ec2bc (patch) | |
| tree | 1deae768e282b203892f5e29a9d4bf1271f43397 /Makefile.am | |
| parent | 86d93063c6d662e7cae91ff8a2adf39b4d93fe53 (diff) | |
| download | protobuf-35a1cc7a7c7cfd205641f15258ca991f6d3ec2bc.tar.gz protobuf-35a1cc7a7c7cfd205641f15258ca991f6d3ec2bc.tar.bz2 protobuf-35a1cc7a7c7cfd205641f15258ca991f6d3ec2bc.zip | |
Added first version of conformance tests.
Change-Id: Ib75664194491643f8e4f1503a2ed942a2d1e1655
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 |