Skip to content

Commit

Permalink
Synchronized with updates in Mesos.
Browse files Browse the repository at this point in the history
  • Loading branch information
benh committed May 28, 2013
1 parent fb33469 commit 63ecafe
Show file tree
Hide file tree
Showing 104 changed files with 3,423 additions and 554 deletions.
6 changes: 4 additions & 2 deletions third_party/Makefile.am → 3rdparty/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This Makefile is for building third_party packages from
# This Makefile is for building third-party packages from
# tarballs. For autotools-based packages, we configure each of the
# packages to build static PIC binaries which we can safely link into
# a shared libmesos, and build it in-place without installing it (even
Expand Down Expand Up @@ -33,7 +33,7 @@ EXTRA_DIST = \
$(GMOCK).tar.gz \
$(GPERFTOOLS).tar.gz \
$(LIBEV).tar.gz \
libev-3.8.patch \
$(LIBEV).patch \
$(PROTOBUF).tar.gz \
$(RY_HTTP_PARSER).tar.gz

Expand Down Expand Up @@ -119,6 +119,7 @@ stout_tests_SOURCES = \
$(STOUT)/tests/bytes_tests.cpp \
$(STOUT)/tests/duration_tests.cpp \
$(STOUT)/tests/error_tests.cpp \
$(STOUT)/tests/flags_tests.cpp \
$(STOUT)/tests/gzip_tests.cpp \
$(STOUT)/tests/hashset_tests.cpp \
$(STOUT)/tests/json_tests.cpp \
Expand All @@ -127,6 +128,7 @@ stout_tests_SOURCES = \
$(STOUT)/tests/none_tests.cpp \
$(STOUT)/tests/os_tests.cpp \
$(STOUT)/tests/strings_tests.cpp \
$(STOUT)/tests/thread_tests.cpp \
$(STOUT)/tests/uuid_tests.cpp

if OS_LINUX
Expand Down
Loading

0 comments on commit 63ecafe

Please sign in to comment.