Rename `common/libtripe.a' to `.../libcommon.a'.

The main server will be a library soon, and it deserves that name more.

diff --git a/client/Makefile.am b/client/Makefile.am
index a573396830850c1e6a5c6a39564066f934966e1b..7d056a600ef894a37e1921b36c674a620d6bc7ac 100644 (file)
--- 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 1b4de55da3aa8ee067b10e686781f90ab91070ac..388b2efe8df0935ff736c491caecf016f73c2334 100644 (file)
--- 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 629659eb0f193944487fc0db664022b5b7b95073..4598e9cb6c22e06d3c2ebf341012f317e63d0419 100644 (file)
--- 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 f569b4559bbf3c96f08e41a8ca705fcea757b1a2..02984546993e9e2ae0e2b2c81d2d92e917576cd2 100644 (file)
--- 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 7c686ddd30db74f49ef961dffe426d6f2b3328eb..6ef92b0b83c53abe5cf2c3fd47932415f2a99e87 100644 (file)
--- 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
 
 ###--------------------------------------------------------------------------