From fae797e220f5a020e731e8563d3831e9d43b423c Mon Sep 17 00:00:00 2001 From: crs Date: Wed, 31 Jul 2002 16:57:26 +0000 Subject: [PATCH] Moved version header to base and it now uses VERSION macro from config.h if available (which means version is now a string, not three integers). Changed version to 1.0.0 and protocol version to 1.0. And added MAINTAINERCLEANFILES to makefiles to remove generated files. --- Makefile.am | 30 ++++++++++++++++++++++-------- cmd/Makefile.am | 8 +++++++- cmd/synergy/Makefile.am | 12 ++++++++---- cmd/synergy/synergy.cpp | 6 ++---- cmd/synergyd/Makefile.am | 12 ++++++++---- cmd/synergyd/synergyd.cpp | 6 ++---- configure.in | 2 +- lib/Makefile.am | 8 +++++++- lib/base/Makefile.am | 5 +++++ lib/{synergy => base}/Version.h | 11 +++++++---- lib/client/Makefile.am | 4 ++++ lib/http/Makefile.am | 4 ++++ lib/io/Makefile.am | 8 ++++++-- lib/mt/Makefile.am | 4 ++++ lib/net/Makefile.am | 4 ++++ lib/platform/Makefile.am | 4 ++++ lib/server/Makefile.am | 4 ++++ lib/synergy/Makefile.am | 5 ++++- lib/synergy/ProtocolTypes.h | 4 ++-- 19 files changed, 105 insertions(+), 36 deletions(-) rename lib/{synergy => base}/Version.h (82%) diff --git a/Makefile.am b/Makefile.am index 674b2d5a..09e0b5c5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,14 +2,28 @@ NULL = DEPTH = . -EXTRA_DIST = \ - all.dsp \ - synergy.dsw \ - doc/doxygen.cfg \ - examples/synergy.conf \ +SUBDIRS = \ + lib \ + cmd \ $(NULL) -SUBDIRS = \ - lib \ - cmd \ +EXTRA_DIST = \ + all.dsp \ + synergy.dsw \ + doc/doxygen.cfg \ + examples/synergy.conf \ + $(NULL) + +MAINTAINERCLEANFILES = \ + Makefile.in \ + aclocal.m4 \ + config.h \ + config.h.in \ + config.guess \ + config.log \ + config.status \ + config.sub \ + configure \ + stamp-h.in \ + stamp-h1 \ $(NULL) diff --git a/cmd/Makefile.am b/cmd/Makefile.am index 7219f8ee..60341d6a 100644 --- a/cmd/Makefile.am +++ b/cmd/Makefile.am @@ -2,8 +2,14 @@ NULL = DEPTH = .. -EXTRA_DIST = SUBDIRS = \ synergy \ synergyd \ $(NULL) + +EXTRA_DIST = \ + $(NULL) + +MAINTAINERCLEANFILES = \ + Makefile.in \ + $(NULL) diff --git a/cmd/synergy/Makefile.am b/cmd/synergy/Makefile.am index 5eff699d..0345af5a 100644 --- a/cmd/synergy/Makefile.am +++ b/cmd/synergy/Makefile.am @@ -2,10 +2,14 @@ NULL = DEPTH = ../.. -EXTRA_DIST = \ - synergy.dsp \ - synergy.rc \ - resource.h \ +EXTRA_DIST = \ + synergy.dsp \ + synergy.rc \ + resource.h \ + $(NULL) + +MAINTAINERCLEANFILES = \ + Makefile.in \ $(NULL) bin_PROGRAMS = synergy diff --git a/cmd/synergy/synergy.cpp b/cmd/synergy/synergy.cpp index 06d0481c..aeb206e3 100644 --- a/cmd/synergy/synergy.cpp +++ b/cmd/synergy/synergy.cpp @@ -218,12 +218,10 @@ void version() { log((CLOG_PRINT -"%s %d.%d.%d, protocol version %d.%d\n" +"%s %s, protocol version %d.%d\n" "%s", pname, - kMajorVersion, - kMinorVersion, - kReleaseVersion, + kVersion, kProtocolMajorVersion, kProtocolMinorVersion, kCopyright)); diff --git a/cmd/synergyd/Makefile.am b/cmd/synergyd/Makefile.am index 2593eb51..f3e75fce 100644 --- a/cmd/synergyd/Makefile.am +++ b/cmd/synergyd/Makefile.am @@ -2,10 +2,14 @@ NULL = DEPTH = ../.. -EXTRA_DIST = \ - synergyd.dsp \ - synergyd.rc \ - resource.h \ +EXTRA_DIST = \ + synergyd.dsp \ + synergyd.rc \ + resource.h \ + $(NULL) + +MAINTAINERCLEANFILES = \ + Makefile.in \ $(NULL) bin_PROGRAMS = synergyd diff --git a/cmd/synergyd/synergyd.cpp b/cmd/synergyd/synergyd.cpp index 60d070c4..4a971071 100644 --- a/cmd/synergyd/synergyd.cpp +++ b/cmd/synergyd/synergyd.cpp @@ -242,12 +242,10 @@ void version() { log((CLOG_PRINT -"%s %d.%d.%d, protocol version %d.%d\n" +"%s %s, protocol version %d.%d\n" "%s", pname, - kMajorVersion, - kMinorVersion, - kReleaseVersion, + kVersion, kProtocolMajorVersion, kProtocolMinorVersion, kCopyright)); diff --git a/configure.in b/configure.in index 69a99df6..53c87cbc 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(lib/base/common.h) AM_CONFIG_HEADER(config.h) AC_CONFIG_AUX_DIR(config) -AM_INIT_AUTOMAKE(synergy, 0.5) +AM_INIT_AUTOMAKE(synergy, 1.0.0) dnl information on the package diff --git a/lib/Makefile.am b/lib/Makefile.am index 0892a6b7..c7dda5af 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,7 +2,6 @@ NULL = DEPTH = .. -EXTRA_DIST = SUBDIRS = \ base \ mt \ @@ -14,3 +13,10 @@ SUBDIRS = \ client \ server \ $(NULL) + +EXTRA_DIST = \ + $(NULL) + +MAINTAINERCLEANFILES = \ + Makefile.in \ + $(NULL) diff --git a/lib/base/Makefile.am b/lib/base/Makefile.am index f52d5bf6..d32a3f6a 100644 --- a/lib/base/Makefile.am +++ b/lib/base/Makefile.am @@ -6,6 +6,10 @@ EXTRA_DIST = \ base.dsp \ $(NULL) +MAINTAINERCLEANFILES = \ + Makefile.in \ + $(NULL) + noinst_LIBRARIES = libbase.a libbase_a_SOURCES = \ CFunctionJob.cpp \ @@ -23,6 +27,7 @@ libbase_a_SOURCES = \ IInterface.h \ IJob.h \ TMethodJob.h \ + Version.h \ XBase.h \ common.h \ stdfstream.h \ diff --git a/lib/synergy/Version.h b/lib/base/Version.h similarity index 82% rename from lib/synergy/Version.h rename to lib/base/Version.h index 128f500c..34ce990b 100644 --- a/lib/synergy/Version.h +++ b/lib/base/Version.h @@ -1,7 +1,12 @@ #ifndef VERSION_H #define VERSION_H -#include "BasicTypes.h" +#include "common.h" + +// set version macro if not set yet +#if !defined(VERSION) +# define VERSION "1.0.0" +#endif // important strings static const char* kCopyright = "Copyright (C) 2002 Chris Schoeneman"; @@ -10,9 +15,7 @@ static const char* kWebsite = ""; // build version. follows linux kernel style: an even minor number implies // a release version, odd implies development version. -static const SInt16 kMajorVersion = 0; -static const SInt16 kMinorVersion = 9; -static const SInt16 kReleaseVersion = 7; +static const char* kVersion = VERSION; // exit codes static const int kExitSuccess = 0; // successful completion diff --git a/lib/client/Makefile.am b/lib/client/Makefile.am index 1801c61b..b0516091 100644 --- a/lib/client/Makefile.am +++ b/lib/client/Makefile.am @@ -8,6 +8,10 @@ EXTRA_DIST = \ CMSWindowsSecondaryScreen.h \ $(NULL) +MAINTAINERCLEANFILES = \ + Makefile.in \ + $(NULL) + noinst_LIBRARIES = libclient.a libclient_a_SOURCES = \ CClient.cpp \ diff --git a/lib/http/Makefile.am b/lib/http/Makefile.am index 07f4ad44..26adc718 100644 --- a/lib/http/Makefile.am +++ b/lib/http/Makefile.am @@ -6,6 +6,10 @@ EXTRA_DIST = \ http.dsp \ $(NULL) +MAINTAINERCLEANFILES = \ + Makefile.in \ + $(NULL) + noinst_LIBRARIES = libhttp.a libhttp_a_SOURCES = \ CHTTPProtocol.cpp \ diff --git a/lib/io/Makefile.am b/lib/io/Makefile.am index e244a402..c64ee7a4 100644 --- a/lib/io/Makefile.am +++ b/lib/io/Makefile.am @@ -2,8 +2,12 @@ NULL = DEPTH = ../.. -EXTRA_DIST = \ - io.dsp \ +EXTRA_DIST = \ + io.dsp \ + $(NULL) + +MAINTAINERCLEANFILES = \ + Makefile.in \ $(NULL) noinst_LIBRARIES = libio.a diff --git a/lib/mt/Makefile.am b/lib/mt/Makefile.am index 88e2c06c..9c4ca47f 100644 --- a/lib/mt/Makefile.am +++ b/lib/mt/Makefile.am @@ -6,6 +6,10 @@ EXTRA_DIST = \ mt.dsp \ $(NULL) +MAINTAINERCLEANFILES = \ + Makefile.in \ + $(NULL) + noinst_LIBRARIES = libmt.a libmt_a_SOURCES = \ CLock.cpp \ diff --git a/lib/net/Makefile.am b/lib/net/Makefile.am index dc9f1417..561ea886 100644 --- a/lib/net/Makefile.am +++ b/lib/net/Makefile.am @@ -6,6 +6,10 @@ EXTRA_DIST = \ net.dsp \ $(NULL) +MAINTAINERCLEANFILES = \ + Makefile.in \ + $(NULL) + noinst_LIBRARIES = libnet.a libnet_a_SOURCES = \ CNetwork.cpp \ diff --git a/lib/platform/Makefile.am b/lib/platform/Makefile.am index 9cf62784..ffca7356 100644 --- a/lib/platform/Makefile.am +++ b/lib/platform/Makefile.am @@ -25,6 +25,10 @@ EXTRA_DIST = \ IMSWindowsScreenEventHandler.h \ $(NULL) +MAINTAINERCLEANFILES = \ + Makefile.in \ + $(NULL) + noinst_LIBRARIES = libplatform.a libplatform_a_SOURCES = \ CPlatform.cpp \ diff --git a/lib/server/Makefile.am b/lib/server/Makefile.am index d2f666f5..774509cf 100644 --- a/lib/server/Makefile.am +++ b/lib/server/Makefile.am @@ -8,6 +8,10 @@ EXTRA_DIST = \ CMSWindowsPrimaryScreen.h \ $(NULL) +MAINTAINERCLEANFILES = \ + Makefile.in \ + $(NULL) + noinst_LIBRARIES = libserver.a libserver_a_SOURCES = \ CClientProxy.cpp \ diff --git a/lib/synergy/Makefile.am b/lib/synergy/Makefile.am index e52e7cfc..316d9b4e 100644 --- a/lib/synergy/Makefile.am +++ b/lib/synergy/Makefile.am @@ -6,6 +6,10 @@ EXTRA_DIST = \ libsynergy.dsp \ $(NULL) +MAINTAINERCLEANFILES = \ + Makefile.in \ + $(NULL) + noinst_LIBRARIES = libsynergy.a libsynergy_a_SOURCES = \ CInputPacketStream.cpp \ @@ -30,7 +34,6 @@ libsynergy_a_SOURCES = \ KeyTypes.h \ MouseTypes.h \ ProtocolTypes.h \ - Version.h \ XScreen.h \ XSynergy.h \ $(NULL) diff --git a/lib/synergy/ProtocolTypes.h b/lib/synergy/ProtocolTypes.h index d524d98b..2920d339 100644 --- a/lib/synergy/ProtocolTypes.h +++ b/lib/synergy/ProtocolTypes.h @@ -4,8 +4,8 @@ #include "BasicTypes.h" // protocol version number -static const SInt16 kProtocolMajorVersion = 0; -static const SInt16 kProtocolMinorVersion = 7; +static const SInt16 kProtocolMajorVersion = 1; +static const SInt16 kProtocolMinorVersion = 0; // default contact port number static const UInt16 kDefaultPort = 24800;