From 530f09cb3df72453db9b0aad7c00605ab2baf5e1 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Sat, 16 Jun 2018 15:52:21 +0100 Subject: [PATCH] Rename `common/libtripe.a' to `.../libcommon.a'. The main server will be a library soon, and it deserves that name more. --- client/Makefile.am | 2 +- common/Makefile.am | 10 +++++----- priv/Makefile.am | 2 +- server/Makefile.am | 2 +- vars.am | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/Makefile.am b/client/Makefile.am index a5733968..7d056a60 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -27,7 +27,7 @@ include $(top_srcdir)/vars.am bin_PROGRAMS = man_MANS = -LDADD = $(libtripe) $(mLib_LIBS) +LDADD = $(libcommon) $(mLib_LIBS) ###-------------------------------------------------------------------------- ### Client program. diff --git a/common/Makefile.am b/common/Makefile.am index 1b4de55d..388b2efe 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -24,19 +24,19 @@ include $(top_srcdir)/vars.am -noinst_LIBRARIES = libtripe.a +noinst_LIBRARIES = libcommon.a ###-------------------------------------------------------------------------- ### Library. -libtripe_a_SOURCES = +libcommon_a_SOURCES = ## Protocol definitions. -libtripe_a_SOURCES += protocol.h -libtripe_a_SOURCES += slip.h +libcommon_a_SOURCES += protocol.h +libcommon_a_SOURCES += slip.h ## Miscellaneous utilties. -libtripe_a_SOURCES += util.c util.h +libcommon_a_SOURCES += util.c util.h ###-------------------------------------------------------------------------- ### Documentation. diff --git a/priv/Makefile.am b/priv/Makefile.am index 629659eb..4598e9cb 100644 --- a/priv/Makefile.am +++ b/priv/Makefile.am @@ -28,7 +28,7 @@ noinst_LIBRARIES = libpriv.a libexec_PROGRAMS = tripe-privhelper man_MANS = -LDADD = libpriv.a $(libtripe) $(mLib_LIBS) +LDADD = libpriv.a $(libcommon) $(mLib_LIBS) ###-------------------------------------------------------------------------- ### Library. diff --git a/server/Makefile.am b/server/Makefile.am index f569b455..02984546 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -28,7 +28,7 @@ sbin_PROGRAMS = noinst_PROGRAMS = man_MANS = -LDADD = $(libtripe) $(libpriv) \ +LDADD = $(libcommon) $(libpriv) \ $(catacomb_LIBS) $(ADNS_LIBS) ###-------------------------------------------------------------------------- diff --git a/vars.am b/vars.am index 7c686ddd..6ef92b0b 100644 --- a/vars.am +++ b/vars.am @@ -46,7 +46,7 @@ AM_CPPFLAGS += $(TRIPE_INCLUDES) ### Miscellanous useful definitions. ## Libraries of common code. -libtripe = $(top_builddir)/common/libtripe.a +libcommon = $(top_builddir)/common/libcommon.a libpriv = $(top_builddir)/priv/libpriv.a ###-------------------------------------------------------------------------- -- 2.11.0