From b0bb56303366e2c072ee38eb5f1f11251b07239c Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 8 Sep 2014 13:42:32 +0200 Subject: [PATCH] Makefile.am: fix parallel build of t/generated-code2/cxx-generate-packed-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.) --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 3ec4b6e..fc23337 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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)