From 1e933b412093ca1528299eefebb12bcdbf27954b Mon Sep 17 00:00:00 2001 From: Shawn Chain Date: Fri, 5 Oct 2018 21:31:34 +0800 Subject: [PATCH] Clean up --- Common/Makefile | 2 -- GlobalDefines.h | 8 ++++---- common.mk | 0 ircDDB/Makefile | 2 -- ircDDBGateway/Makefile | 2 -- 5 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 common.mk diff --git a/Common/Makefile b/Common/Makefile index a71fdbf..8643148 100644 --- a/Common/Makefile +++ b/Common/Makefile @@ -1,5 +1,3 @@ -include ../common.mk - OBJECTS = AMBEData.o AnnouncementUnit.o APRSCollector.o APRSWriter.o APRSWriterThread.o AudioUnit.o CacheManager.o CallsignList.o \ CallsignServer.o CCITTChecksum.o CCSData.o CCSHandler.o CCSProtocolHandler.o ConnectData.o DCSHandler.o DCSProtocolHandler.o \ DCSProtocolHandlerPool.o DDData.o DDHandler.o DExtraHandler.o DExtraProtocolHandler.o DExtraProtocolHandlerPool.o \ diff --git a/GlobalDefines.h b/GlobalDefines.h index b70ff1d..c5317a5 100644 --- a/GlobalDefines.h +++ b/GlobalDefines.h @@ -2,9 +2,9 @@ #define __GLOBAL_DEFS__ #if defined(__APPLE__) -#define DATA_DIR "/etc/mmdvm/dstar" -#define LOG_DIR "/var/log/mmdvm" -#define CONF_DIR "/etc" +#define DATA_DIR "/opt/mmdvm/conf/dstar" +#define LOG_DIR "/opt/mmdvm/logs" +#define CONF_DIR "/opt/mmdvm/conf" #define CONF_FILE "ircDDBGateway.ini" #define LOG_BASE "ircDDBGateway" @@ -20,7 +20,7 @@ #define LOG_DIR "/tmp" #define CONF_DIR "/etc" #define CONF_FILE "ircddbgateway" -#define LOG_BASE "ircddbgateway" +#define LOG_BASE "ircddbgatewayd" #endif diff --git a/common.mk b/common.mk deleted file mode 100644 index e69de29..0000000 diff --git a/ircDDB/Makefile b/ircDDB/Makefile index f93728e..b841a5e 100644 --- a/ircDDB/Makefile +++ b/ircDDB/Makefile @@ -1,5 +1,3 @@ -include ../common.mk - OBJECTS = IRCClient.o IRCDDBApp.o IRCDDBClient.o IRCDDB.o IRCDDBMultiClient.o IRCMessage.o IRCMessageQueue.o IRCProtocol.o IRCReceiver.o \ IRCutils.o diff --git a/ircDDBGateway/Makefile b/ircDDBGateway/Makefile index 62016ab..3bf974e 100644 --- a/ircDDBGateway/Makefile +++ b/ircDDBGateway/Makefile @@ -1,5 +1,3 @@ -include ../common.mk - OBJECTS = IRCDDBGatewayAppD.o IRCDDBGatewayStatusData.o IRCDDBGatewayThread.o IRCDDBGatewayThreadHelper.o all: ircddbgatewayd