From edada5e1ea4f901f219aef26574b1f38aa57d72f Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 28 Feb 2012 18:40:21 -0500 Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20use=20$(builddir)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit $(builddir) is always ., except apparently on automake 1.9 which doesn’t define it. Signed-off-by: Anders Kaseorg --- src/examples/Makefile.am | 4 ++-- src/frontend/Makefile.am | 2 +- src/network/Makefile.am | 2 +- src/protobufs/Makefile.am | 2 +- src/statesync/Makefile.am | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am index d62bf1f..46232ae 100644 --- a/src/examples/Makefile.am +++ b/src/examples/Makefile.am @@ -16,7 +16,7 @@ parse_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util parse_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a -lutil $(BOOST_LDFLAGS) termemu_SOURCES = termemu.cc -termemu_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util -I$(srcdir)/../statesync -I$(builddir)/../protobufs +termemu_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util -I$(srcdir)/../statesync -I../protobufs termemu_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a ../statesync/libmoshstatesync.a ../protobufs/libmoshprotos.a -lutil $(BOOST_LDFLAGS) $(protobuf_LIBS) if COND_THIRD_LIBSTDDJB termemu_CPPFLAGS += -I$(top_srcdir)/third/libstddjb @@ -27,5 +27,5 @@ else endif ntester_SOURCES = ntester.cc -ntester_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I$(builddir)/../protobufs $(BOOST_CPPFLAGS) +ntester_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs $(BOOST_CPPFLAGS) ntester_LDADD = ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../protobufs/libmoshprotos.a -lutil -lm $(BOOST_LDFLAGS) $(protobuf_LIBS) diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am index 6911006..1affc12 100644 --- a/src/frontend/Makefile.am +++ b/src/frontend/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I$(builddir)/../protobufs -I$(srcdir)/../util $(BOOST_CPPFLAGS) $(protobuf_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs -I$(srcdir)/../util $(BOOST_CPPFLAGS) $(protobuf_CFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) -fno-default-inline -pipe LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a -lutil -lm $(protobuf_LIBS) if COND_THIRD_LIBSTDDJB diff --git a/src/network/Makefile.am b/src/network/Makefile.am index 25a8e44..001637c 100644 --- a/src/network/Makefile.am +++ b/src/network/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../crypto -I$(builddir)/../protobufs $(BOOST_CPPFLAGS) $(protobuf_CFLAGS) +AM_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../crypto -I../protobufs $(BOOST_CPPFLAGS) $(protobuf_CFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) -fno-default-inline -pipe noinst_LIBRARIES = libmoshnetwork.a diff --git a/src/protobufs/Makefile.am b/src/protobufs/Makefile.am index 49b514f..96f164a 100644 --- a/src/protobufs/Makefile.am +++ b/src/protobufs/Makefile.am @@ -6,7 +6,7 @@ AM_CXXFLAGS = $(WARNING_CXXFLAGS) -fno-default-inline -pipe SUFFIXES = .proto .pb.cc .proto.pb.cc: - $(AM_V_GEN)$(PROTOC) --cpp_out=$(builddir) -I$(srcdir) $< + $(AM_V_GEN)$(PROTOC) --cpp_out=. -I$(srcdir) $< noinst_LIBRARIES = libmoshprotos.a diff --git a/src/statesync/Makefile.am b/src/statesync/Makefile.am index 4a5615c..445f1f7 100644 --- a/src/statesync/Makefile.am +++ b/src/statesync/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(srcdir)/../terminal -I$(builddir)/../protobufs $(BOOST_CPPFLAGS) +AM_CPPFLAGS = -I$(srcdir)/../terminal -I../protobufs $(BOOST_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) -fno-default-inline -pipe noinst_LIBRARIES = libmoshstatesync.a