From 735dcd6ad56f8fb87b0cc0ec9b8a8b1656732263 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 21 Apr 2012 02:11:52 -0400 Subject: [PATCH] Clarify COND_THIRD_LIBSTDDJB code Signed-off-by: Anders Kaseorg --- src/examples/Makefile.am | 28 ++++++++++------------------ src/frontend/Makefile.am | 17 ++++++++--------- 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am index bb12112..1a217c9 100644 --- a/src/examples/Makefile.am +++ b/src/examples/Makefile.am @@ -1,3 +1,9 @@ +# This must be set in Makefile.am for dependency tracking to work. +if COND_THIRD_LIBSTDDJB + STDDJB_LDFLAGS += $(top_builddir)/third/libstddjb/libstddjb.a + STDDJB_CPPFLAGS += -I$(top_srcdir)/third/libstddjb +endif + AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) AM_LDFLAGS = $(HARDEN_LDFLAGS) @@ -18,27 +24,13 @@ parse_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util $(poll_CFLAGS) parse_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a -lutil $(poll_LIBS) termemu_SOURCES = termemu.cc -termemu_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util -I$(srcdir)/../statesync -I../protobufs $(poll_CFLAGS) -termemu_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a ../statesync/libmoshstatesync.a ../protobufs/libmoshprotos.a -lutil $(TINFO_LIBS) $(protobuf_LIBS) $(poll_LIBS) -if COND_THIRD_LIBSTDDJB - termemu_CPPFLAGS += -I$(top_srcdir)/third/libstddjb - termemu_LDADD += $(top_builddir)/third/libstddjb/libstddjb.a -else - termemu_CPPFLAGS += $(STDDJB_CPPFLAGS) - termemu_LDADD += $(STDDJB_LDFLAGS) -endif +termemu_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util -I$(srcdir)/../statesync -I../protobufs $(STDDJB_CPPFLAGS) $(poll_CFLAGS) +termemu_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a ../statesync/libmoshstatesync.a ../protobufs/libmoshprotos.a -lutil $(STDDJB_LDFLAGS) $(TINFO_LIBS) $(protobuf_LIBS) $(poll_LIBS) ntester_SOURCES = ntester.cc ntester_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs $(poll_CFLAGS) $(protobuf_CFLAGS) ntester_LDADD = ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../protobufs/libmoshprotos.a $(poll_LIBS) -lutil -lm $(protobuf_LIBS) benchmark_SOURCES = benchmark.cc -benchmark_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I../protobufs -I$(srcdir)/../frontend -I$(srcdir)/../crypto -I$(srcdir)/../network $(poll_CFLAGS) $(protobuf_CFLAGS) -benchmark_LDADD = ../frontend/terminaloverlay.o ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../protobufs/libmoshprotos.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../util/libmoshutil.a $(poll_LIBS) -lutil -lm $(TINFO_LIBS) $(protobuf_LIBS) -if COND_THIRD_LIBSTDDJB - benchmark_CPPFLAGS += -I$(top_srcdir)/third/libstddjb - benchmark_LDADD += $(top_builddir)/third/libstddjb/libstddjb.a -else - benchmark_CPPFLAGS += $(STDDJB_CPPFLAGS) - benchmark_LDADD += $(STDDJB_LDFLAGS) -endif +benchmark_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I../protobufs -I$(srcdir)/../frontend -I$(srcdir)/../crypto -I$(srcdir)/../network $(STDDJB_CPPFLAGS) $(poll_CFLAGS) $(protobuf_CFLAGS) +benchmark_LDADD = ../frontend/terminaloverlay.o ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../protobufs/libmoshprotos.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../util/libmoshutil.a $(STDDJB_LDFLAGS) $(poll_LIBS) -lutil -lm $(TINFO_LIBS) $(protobuf_LIBS) diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am index fa486ff..673b348 100644 --- a/src/frontend/Makefile.am +++ b/src/frontend/Makefile.am @@ -1,14 +1,13 @@ -AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs -I$(srcdir)/../util $(TINFO_CFLAGS) $(protobuf_CFLAGS) $(poll_CFLAGS) +# This must be set in Makefile.am for dependency tracking to work. +if COND_THIRD_LIBSTDDJB + STDDJB_LDFLAGS += $(top_builddir)/third/libstddjb/libstddjb.a + STDDJB_CPPFLAGS += -I$(top_srcdir)/third/libstddjb +endif + +AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs -I$(srcdir)/../util $(STDDJB_CPPFLAGS) $(TINFO_CFLAGS) $(protobuf_CFLAGS) $(poll_CFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) AM_LDFLAGS = $(HARDEN_LDFLAGS) -LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a $(poll_LIBS) -lm $(TINFO_LIBS) $(protobuf_LIBS) -if COND_THIRD_LIBSTDDJB - AM_CPPFLAGS += -I$(top_srcdir)/third/libstddjb - LDADD += $(top_builddir)/third/libstddjb/libstddjb.a -else - AM_CPPFLAGS += $(STDDJB_CPPFLAGS) - LDADD += $(STDDJB_LDFLAGS) -endif +LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a $(STDDJB_LDFLAGS) $(poll_LIBS) -lm $(TINFO_LIBS) $(protobuf_LIBS) mosh_server_LDADD = $(LDADD) -lutil