diff options
| author |  Quentin Smith <quentin@mit.edu> | 2012-02-26 01:17:12 -0500 |
|---|---|---|
| committer |  Keith Winstein <keithw@mit.edu> | 2012-03-07 03:05:36 -0500 |
| commit | e8d14d35a64edc32b1ebbb6aae8e4b998ea93cfd (patch) | |
| tree | 75c93b6cc331a8823b33e5a0122d5192e8eb7496 /src | |
| parent | 582bf347c9939c1648be9edc9e229f5d30e2f07c (diff) | |
Add boost and protobuf in the places where they are needed
[seph@directionless.org, andersk@mit.edu: add in even more places]
Diffstat (limited to 'src')
| -rw-r--r-- | src/examples/Makefile.am | 9 | ||||
| -rw-r--r-- | src/frontend/Makefile.am | 2 | ||||
| -rw-r--r-- | src/network/Makefile.am | 2 | ||||
| -rw-r--r-- | src/statesync/Makefile.am | 2 | ||||
| -rw-r--r-- | src/terminal/Makefile.am | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am index cf18eb5..21ad2da 100644 --- a/src/examples/Makefile.am +++ b/src/examples/Makefile.am @@ -1,3 +1,4 @@ +AM_CPPFLAGS = $(protobuf_CFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) -fno-default-inline -pipe noinst_PROGRAMS = encrypt decrypt ntester parse termemu @@ -12,12 +13,12 @@ decrypt_LDADD = ../crypto/libmoshcrypto.a parse_SOURCES = parse.cc parse_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util -parse_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a -lutil +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_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a ../statesync/libmoshstatesync.a ../protobufs/libmoshprotos.a -lutil $(protobuf_LIBS) +termemu_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a ../statesync/libmoshstatesync.a ../protobufs/libmoshprotos.a -lutil $(BOOST_LDFLAGS) $(protobuf_LIBS) ntester_SOURCES = ntester.cc -ntester_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I$(builddir)/../protobufs -ntester_LDADD = ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../protobufs/libmoshprotos.a -lutil -lm $(protobuf_LIBS) +ntester_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I$(builddir)/../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 2fe4e78..8be429a 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 +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_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) diff --git a/src/network/Makefile.am b/src/network/Makefile.am index 0395bf1..25a8e44 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 +AM_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../crypto -I$(builddir)/../protobufs $(BOOST_CPPFLAGS) $(protobuf_CFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) -fno-default-inline -pipe noinst_LIBRARIES = libmoshnetwork.a diff --git a/src/statesync/Makefile.am b/src/statesync/Makefile.am index eda87e4..4a5615c 100644 --- a/src/statesync/Makefile.am +++ b/src/statesync/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(srcdir)/../terminal -I$(builddir)/../protobufs +AM_CPPFLAGS = -I$(srcdir)/../terminal -I$(builddir)/../protobufs $(BOOST_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) -fno-default-inline -pipe noinst_LIBRARIES = libmoshstatesync.a diff --git a/src/terminal/Makefile.am b/src/terminal/Makefile.am index 69ea682..9cf22f2 100644 --- a/src/terminal/Makefile.am +++ b/src/terminal/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(srcdir)/../util +AM_CPPFLAGS = -I$(srcdir)/../util $(BOOST_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) -fno-default-inline -pipe noinst_LIBRARIES = libmoshterminal.a |