From fab69fd98c32960ee38f5d69ea076267504591bd Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sun, 5 Feb 2012 19:24:32 -0500 Subject: [PATCH] Use protobuf_lite_CFLAGS and protobuf_lite_LIBS from configure Signed-off-by: Anders Kaseorg --- src/examples/Makefile.am | 2 +- src/frontend/Makefile.am | 2 +- src/protobufs/Makefile.am | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am index 9c6ca1c..dfef259 100644 --- a/src/examples/Makefile.am +++ b/src/examples/Makefile.am @@ -2,7 +2,7 @@ AM_CXXFLAGS = --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-default- noinst_PROGRAMS = encrypt decrypt ntester parse termemu -LIBS = `pkg-config --libs protobuf-lite` +LIBS = $(protobuf_lite_LIBS) encrypt_SOURCES = encrypt.cc encrypt_CPPFLAGS = -I$(srcdir)/../crypto diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am index caec300..e990955 100644 --- a/src/frontend/Makefile.am +++ b/src/frontend/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I$(builddir)/../protobufs -I$(srcdir)/../util AM_CXXFLAGS = --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe -LIBS = `pkg-config --libs protobuf-lite` +LIBS = $(protobuf_lite_LIBS) LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a -lutil -lrt -lm bin_PROGRAMS = mosh-client mosh-server diff --git a/src/protobufs/Makefile.am b/src/protobufs/Makefile.am index 06a89e9..ad4a334 100644 --- a/src/protobufs/Makefile.am +++ b/src/protobufs/Makefile.am @@ -1,7 +1,8 @@ source = userinput.proto hostinput.proto transportinstruction.proto PROTOC = protoc -AM_CXXFLAGS = `pkg-config --cflags protobuf-lite` -g -O2 --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe +AM_CPPFLAGS = $(protobuf_lite_CFLAGS) +AM_CXXFLAGS = -g -O2 --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe userinput.pb.cc: userinput.proto $(PROTOC) --cpp_out=$(builddir) -I$(srcdir) $<