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

Makefile tweaks to pass "make distclean"

Browse Source
This commit is contained in:
Keith Winstein
2012-02-05 02:48:41 -05:00
parent b0f059aaea
commit 71d02b2298
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.am
-1
View File
@@ -1,2 +1 @@
SUBDIRS = protobufs src scripts
protobufs/Makefile.am
+11 -6
View File
@@ -1,17 +1,22 @@
source = userinput.proto hostinput.proto transportinstruction.proto
PROTOC = protoc
AM_CXXFLAGS = `pkg-config --cflags protobuf-lite`
AM_CXXFLAGS = `pkg-config --cflags protobuf-lite` -g -O2 --std=c++0x -pedantic -Werror -Wall -Wextra -Weffc++ -fno-default-inline -pipe
userinput.pb.cc: userinput.proto
$(PROTOC) --cpp_out=$(builddir) $<
$(PROTOC) --cpp_out=$(builddir) -I$(srcdir) $<
hostinput.pb.cc: hostinput.proto
$(PROTOC) --cpp_out=$(builddir) $<
$(PROTOC) --cpp_out=$(builddir) -I$(srcdir) $<
transportinstruction.pb.cc: transportinstruction.proto
$(PROTOC) --cpp_out=$(builddir) $<
$(PROTOC) --cpp_out=$(builddir) -I$(srcdir) $<
.o.cc:
$(CXX) $(CXXFLAGS) -o $@ $<
noinst_LIBRARIES = libmoshprotos.a
libmoshprotos_a_SOURCES = $(builddir)/userinput.pb.cc $(builddir)/hostinput.pb.cc $(builddir)/transportinstruction.pb.cc
libmoshprotos_a_SOURCES = userinput.proto hostinput.proto transportinstruction.proto
CLEANFILES = $(builddir)/userinput.pb.cc $(builddir)/hostinput.pb.cc $(builddir)/transportinstruction.pb.cc $(builddir)/userinput.pb.h $(builddir)/hostinput.pb.h $(builddir)/transportinstruction.pb.h
libmoshprotos_a_LIBADD = userinput.pb.$(OBJEXT) hostinput.pb.$(OBJEXT) transportinstruction.pb.$(OBJEXT)
CLEANFILES = userinput.pb.cc hostinput.pb.cc transportinstruction.pb.cc userinput.pb.h hostinput.pb.h transportinstruction.pb.h
scripts/Makefile.am
+1 -1
View File
@@ -1 +1 @@
bin_SCRIPTS = mosh
dist_bin_SCRIPTS = mosh
src/Makefile.am
+1 -1
View File
@@ -5,7 +5,7 @@ LDADD = -lutil -lcrypto -lrt -lm $(top_builddir)/protobufs/libmoshprotos.a
bin_PROGRAMS = mosh-client mosh-server
source = parser.cc parserstate.cc terminal.cc parseraction.cc terminalfunctions.cc swrite.cc terminalframebuffer.cc terminaldispatcher.cc terminaluserinput.cc terminaldisplay.cc network.cc ocb.cc base64.cc crypto.cc networktransport.cc transportfragment.cc user.cc completeterminal.cc transportsender.cc stmclient.cc terminaloverlay.cc
source = ae.h base64.cc base64.h completeterminal.cc completeterminal.h crypto.cc crypto.h dos_assert.h network.cc network.h networktransport.cc networktransport.h ocb.cc parseraction.cc parseraction.h parser.cc parser.h parserstate.cc parserstatefamily.h parserstate.h parsertransition.h stmclient.cc stmclient.h swrite.cc swrite.h terminal.cc terminaldispatcher.cc terminaldispatcher.h terminaldisplay.cc terminaldisplay.h terminalframebuffer.cc terminalframebuffer.h terminalfunctions.cc terminal.h terminaloverlay.cc terminaloverlay.h terminaluserinput.cc terminaluserinput.h transportfragment.cc transportfragment.h transportsender.cc transportsender.h transportstate.h user.cc user.h
mosh_client_SOURCES = mosh-client.cc $(source)