Skip to content

Commit

Permalink
Makefile.am: fix parallel build of t/generated-code2/cxx-generate-pac…
Browse files Browse the repository at this point in the history
…ked-data

The object file name is not what is expected when building with
automake's "subdir-objects" option. Rather than expecting automake to
generate a specific filename, we simply make the generated header a
dependency of all objects for cxx-generate-packed-data.

(Issue #156, #169.)
  • Loading branch information
ncopa authored and Robert Edmonds committed Sep 8, 2014
1 parent d80856c commit b0bb563
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile.am
Expand Up @@ -141,7 +141,7 @@ noinst_PROGRAMS += \
t_generated_code2_cxx_generate_packed_data_SOURCES = \
t/generated-code2/cxx-generate-packed-data.cc \
t/test-full.pb.cc
t/generated-code2/cxx-generate-packed-data.$(OBJEXT): t/test-full.pb.h
$(t_generated_code2_cxx_generate_packed_data_OBJECTS): t/test-full.pb.h
t_generated_code2_cxx_generate_packed_data_CXXFLAGS = \
$(AM_CXXFLAGS) \
$(protobuf_CFLAGS)
Expand Down

0 comments on commit b0bb563

Please sign in to comment.