izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use protobuf_lite_CFLAGS and protobuf_lite_LIBS from configure

Browse Source 
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg
2012-02-05 19:24:32 -05:00
parent b1d098d3ca
commit fab69fd98c
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/examples/Makefile.am
+1 -1
View File
@@ -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
src/frontend/Makefile.am
+1 -1
View File
@@ -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
src/protobufs/Makefile.am
+2 -1
View File
@@ -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) $<