From cbe5911223413c0ff1f89934172da2df8eeadbfc Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sun, 5 Feb 2012 19:43:43 -0500 Subject: [PATCH] =?UTF-8?q?Compile=20*.pb.o=20with=20Automake=E2=80=99s=20?= =?UTF-8?q?rules?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg --- src/protobufs/Makefile.am | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/protobufs/Makefile.am b/src/protobufs/Makefile.am index ad4a334..9e0857b 100644 --- a/src/protobufs/Makefile.am +++ b/src/protobufs/Makefile.am @@ -2,22 +2,17 @@ source = userinput.proto hostinput.proto transportinstruction.proto PROTOC = protoc AM_CPPFLAGS = $(protobuf_lite_CFLAGS) -AM_CXXFLAGS = -g -O2 --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe +AM_CXXFLAGS = --std=c++0x -pedantic -Werror -Wall -Wextra -fno-default-inline -pipe -userinput.pb.cc: userinput.proto - $(PROTOC) --cpp_out=$(builddir) -I$(srcdir) $< -hostinput.pb.cc: hostinput.proto - $(PROTOC) --cpp_out=$(builddir) -I$(srcdir) $< -transportinstruction.pb.cc: transportinstruction.proto - $(PROTOC) --cpp_out=$(builddir) -I$(srcdir) $< +SUFFIXES = .proto .pb.cc -.o.cc: - $(CXX) $(CXXFLAGS) -o $@ $< +.proto.pb.cc: + $(PROTOC) --cpp_out=$(builddir) -I$(srcdir) $< noinst_LIBRARIES = libmoshprotos.a -libmoshprotos_a_SOURCES = userinput.proto hostinput.proto transportinstruction.proto +libmoshprotos_a_SOURCES = $(source) +nodist_libmoshprotos_a_SOURCES = $(source:.proto=.pb.cc) $(source:.proto=.pb.h) -libmoshprotos_a_LIBADD = userinput.pb.$(OBJEXT) hostinput.pb.$(OBJEXT) transportinstruction.pb.$(OBJEXT) - -CLEANFILES = userinput.pb.cc hostinput.pb.cc transportinstruction.pb.cc userinput.pb.h hostinput.pb.h transportinstruction.pb.h +BUILT_SOURCES = $(source:.proto=.pb.cc) +CLEANFILES = $(source:.proto=.pb.cc) $(source:.proto=.pb.h)