From 9411fe764d8e29d99efb52da3422c6333b7701be Mon Sep 17 00:00:00 2001 From: wfjm Date: Sat, 30 Mar 2019 08:53:05 +0100 Subject: [PATCH] move RtimerFd, ReventFd to librtools --- tools/src/librlink/Makefile | 5 +++-- tools/src/librlink/RlinkServer.hpp | 7 +++---- tools/src/librtools/Makefile | 5 ++++- tools/src/{librlink => librtools}/ReventFd.cpp | 0 tools/src/{librlink => librtools}/ReventFd.hpp | 0 tools/src/{librlink => librtools}/ReventFd.ipp | 0 tools/src/{librlink => librtools}/RtimerFd.cpp | 0 tools/src/{librlink => librtools}/RtimerFd.hpp | 0 tools/src/{librlink => librtools}/RtimerFd.ipp | 0 tools/src/librw11/Rw11CntlDEUNA.hpp | 7 +++---- 10 files changed, 13 insertions(+), 11 deletions(-) rename tools/src/{librlink => librtools}/ReventFd.cpp (100%) rename tools/src/{librlink => librtools}/ReventFd.hpp (100%) rename tools/src/{librlink => librtools}/ReventFd.ipp (100%) rename tools/src/{librlink => librtools}/RtimerFd.cpp (100%) rename tools/src/{librlink => librtools}/RtimerFd.hpp (100%) rename tools/src/{librlink => librtools}/RtimerFd.ipp (100%) diff --git a/tools/src/librlink/Makefile b/tools/src/librlink/Makefile index f5b4f8ad..076b6da6 100644 --- a/tools/src/librlink/Makefile +++ b/tools/src/librlink/Makefile @@ -1,7 +1,8 @@ -# $Id: Makefile 1100 2019-01-02 10:56:47Z mueller $ +# $Id: Makefile 1125 2019-03-30 07:34:54Z mueller $ # # Revision History: # Date Rev Version Comment +# 2019-03-30 1125 1.1.3 drop ReventFd,RtimerFd # 2019-01-02 1100 1.1.2 drop boost includes and libs # 2013-02-01 479 1.1.1 use checkpath_cpp.mk # 2011-07-31 401 1.1 rename realclean->distclean @@ -32,7 +33,7 @@ OBJ_all += RlinkCrc16.o OBJ_all += RlinkPacketBuf.o RlinkPacketBufSnd.o RlinkPacketBufRcv.o OBJ_all += RlinkPort.o RlinkPortFactory.o OBJ_all += RlinkPortFifo.o RlinkPortTerm.o RlinkPortCuff.o -OBJ_all += RtimerFd.o ReventFd.o ReventLoop.o +OBJ_all += ReventLoop.o OBJ_all += RlinkServer.o RlinkServerEventLoop.o # DEP_all = $(OBJ_all:.o=.dep) diff --git a/tools/src/librlink/RlinkServer.hpp b/tools/src/librlink/RlinkServer.hpp index 4926d6a0..052520b9 100644 --- a/tools/src/librlink/RlinkServer.hpp +++ b/tools/src/librlink/RlinkServer.hpp @@ -1,6 +1,6 @@ -// $Id: RlinkServer.hpp 1088 2018-12-17 17:37:00Z mueller $ +// $Id: RlinkServer.hpp 1125 2019-03-30 07:34:54Z mueller $ // -// Copyright 2013-2018 by Walter F.J. Mueller +// Copyright 2013-2019 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -29,7 +29,6 @@ // --------------------------------------------------------------------------- /*! - \file \brief Declaration of class \c RlinkServer. */ @@ -46,8 +45,8 @@ #include #include "librtools/Rstats.hpp" +#include "librtools/ReventFd.hpp" -#include "ReventFd.hpp" #include "RlinkConnect.hpp" #include "RlinkContext.hpp" #include "RlinkServerEventLoop.hpp" diff --git a/tools/src/librtools/Makefile b/tools/src/librtools/Makefile index 6e124eb2..4b3c083e 100644 --- a/tools/src/librtools/Makefile +++ b/tools/src/librtools/Makefile @@ -1,7 +1,8 @@ -# $Id: Makefile 1100 2019-01-02 10:56:47Z mueller $ +# $Id: Makefile 1125 2019-03-30 07:34:54Z mueller $ # # Revision History: # Date Rev Version Comment +# 2019-03-30 1125 1.1.4 add ReventFd,RtimerFd # 2019-01-02 1100 1.1.3 drop boost includes and libs # 2014-11-01 600 1.1.2 add -lboost_system (needed in boost 1.54) # 2013-02-01 479 1.1.1 use checkpath_cpp.mk @@ -24,6 +25,7 @@ include ../checkpath_cpp.mk # OBJ_all = Rbits.o OBJ_all += RerrMsg.o +OBJ_all += ReventFd.o OBJ_all += Rexception.o OBJ_all += RiosState.o OBJ_all += RlogFile.o RlogFileCatalog.o RlogMsg.o @@ -32,6 +34,7 @@ OBJ_all += RosPrintBvi.o RosPrintfBase.o RosPrintfS.o OBJ_all += RparseUrl.o OBJ_all += Rstats.o OBJ_all += Rtime.o +OBJ_all += RtimerFd.o OBJ_all += Rtools.o # DEP_all = $(OBJ_all:.o=.dep) diff --git a/tools/src/librlink/ReventFd.cpp b/tools/src/librtools/ReventFd.cpp similarity index 100% rename from tools/src/librlink/ReventFd.cpp rename to tools/src/librtools/ReventFd.cpp diff --git a/tools/src/librlink/ReventFd.hpp b/tools/src/librtools/ReventFd.hpp similarity index 100% rename from tools/src/librlink/ReventFd.hpp rename to tools/src/librtools/ReventFd.hpp diff --git a/tools/src/librlink/ReventFd.ipp b/tools/src/librtools/ReventFd.ipp similarity index 100% rename from tools/src/librlink/ReventFd.ipp rename to tools/src/librtools/ReventFd.ipp diff --git a/tools/src/librlink/RtimerFd.cpp b/tools/src/librtools/RtimerFd.cpp similarity index 100% rename from tools/src/librlink/RtimerFd.cpp rename to tools/src/librtools/RtimerFd.cpp diff --git a/tools/src/librlink/RtimerFd.hpp b/tools/src/librtools/RtimerFd.hpp similarity index 100% rename from tools/src/librlink/RtimerFd.hpp rename to tools/src/librtools/RtimerFd.hpp diff --git a/tools/src/librlink/RtimerFd.ipp b/tools/src/librtools/RtimerFd.ipp similarity index 100% rename from tools/src/librlink/RtimerFd.ipp rename to tools/src/librtools/RtimerFd.ipp diff --git a/tools/src/librw11/Rw11CntlDEUNA.hpp b/tools/src/librw11/Rw11CntlDEUNA.hpp index 3fb5dc2e..499c5a2f 100644 --- a/tools/src/librw11/Rw11CntlDEUNA.hpp +++ b/tools/src/librw11/Rw11CntlDEUNA.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11CntlDEUNA.hpp 983 2018-01-02 20:35:59Z mueller $ +// $Id: Rw11CntlDEUNA.hpp 1125 2019-03-30 07:34:54Z mueller $ // -// Copyright 2014-2017 by Walter F.J. Mueller +// Copyright 2014-2019 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -19,7 +19,6 @@ /*! - \file \brief Declaration of class Rw11CntlDEUNA. */ @@ -29,7 +28,7 @@ #include #include "librtools/Rtime.hpp" -#include "librlink/RtimerFd.hpp" +#include "librtools/RtimerFd.hpp" #include "RethBuf.hpp"