Commit 9ed94503 authored by Slava Monich's avatar Slava Monich

[mms-ofono] Renamed mms-ofono into mms-connman-ofono

parent 86e18c65
......@@ -16,8 +16,8 @@ all: debug release
#
SRC = \
mms_ofono_connection.c \
mms_ofono_connman.c
mms_connection_ofono.c \
mms_connman_ofono.c
#
# Directories
......@@ -82,7 +82,7 @@ $(RELEASE_OBJS): | $(RELEASE_BUILD_DIR)
#
# Rules
#
LIB = libmms-ofono.a
LIB = libmms-connman-ofono.a
DEBUG_LIB = $(DEBUG_BUILD_DIR)/$(LIB)
RELEASE_LIB = $(RELEASE_BUILD_DIR)/$(LIB)
......
/*
* Copyright (C) 2013-2015 Jolla Ltd.
* Copyright (C) 2013-2016 Jolla Ltd.
* Contact: Slava Monich <slava.monich@jolla.com>
*
* This program is free software; you can redistribute it and/or modify
......
/*
* Copyright (C) 2013-2015 Jolla Ltd.
* Copyright (C) 2013-2016 Jolla Ltd.
* Contact: Slava Monich <slava.monich@jolla.com>
*
* This program is free software; you can redistribute it and/or modify
......@@ -13,17 +13,17 @@
*
*/
#ifndef JOLLA_MMS_OFONO_LOG_H
#define JOLLA_MMS_OFONO_LOG_H
#ifndef JOLLA_MMS_CONNMAN_OFONO_LOG_H
#define JOLLA_MMS_CONNMAN_OFONO_LOG_H
#include "mms_log.h"
#define MMS_OFONO_LOG_MODULES(log) \
#define MMS_CONNMAN_LOG_MODULES(log) \
log(gofono_log)
MMS_OFONO_LOG_MODULES(GLOG_MODULE_DECL)
MMS_CONNMAN_LOG_MODULES(GLOG_MODULE_DECL)
#endif /* JOLLA_MMS_OFONO_LOG_H */
#endif /* JOLLA_MMS_CONNMAN_OFONO_LOG_H */
/*
* Local Variables:
......
......@@ -16,13 +16,12 @@ CONFIG(debug, debug|release) {
}
SOURCES += \
src/mms_ofono_connection.c \
src/mms_ofono_connman.c
src/mms_connection_ofono.c \
src/mms_connman_ofono.c
HEADERS += \
src/mms_ofono_connection.h \
src/mms_ofono_context.h
src/mms_connection_ofono.h
HEADERS += \
include/mms_ofono_connman.h \
include/mms_ofono_log.h
include/mms_connman_ofono.h \
include/mms_connman_ofono_log.h
/*
* Copyright (C) 2013-2015 Jolla Ltd.
* Copyright (C) 2013-2016 Jolla Ltd.
* Contact: Slava Monich <slava.monich@jolla.com>
*
* This program is free software; you can redistribute it and/or modify
......@@ -21,7 +21,7 @@
#include <gofono_types.h>
MMSConnection*
mms_ofono_connection_new(
mms_connection_ofono_new(
OfonoSimMgr* sim,
OfonoConnCtx* context,
gboolean user_request);
......
......@@ -2,7 +2,7 @@
.PHONY: all debug release clean cleaner
.PHONY: mms_lib_debug_lib mms_lib_release_lib
.PHONY: mms_ofono_debug_lib mms_ofono_release_lib
.PHONY: mms_connman_debug_lib mms_connman_release_lib
.PHONY: mms_handler_debug_lib mms_handler_release_lib
.PHONY: mms_settings_debug_lib mms_settings_release_lib
......@@ -55,14 +55,14 @@ MMS_LIB_DEBUG_LIB = $(MMS_LIB_BUILD_DIR)/debug/$(MMS_LIB_LIB)
MMS_LIB_RELEASE_LIB = $(MMS_LIB_BUILD_DIR)/release/$(MMS_LIB_LIB)
#
# mms-ofono
# mms-connman
#
MMS_OFONO_LIB = libmms-ofono.a
MMS_OFONO_DIR = ../mms-ofono
MMS_OFONO_BUILD_DIR = $(MMS_OFONO_DIR)/build
MMS_OFONO_DEBUG_LIB = $(MMS_OFONO_BUILD_DIR)/debug/$(MMS_OFONO_LIB)
MMS_OFONO_RELEASE_LIB = $(MMS_OFONO_BUILD_DIR)/release/$(MMS_OFONO_LIB)
MMS_CONNMAN_LIB = libmms-connman-ofono.a
MMS_CONNMAN_DIR = ../mms-connman-ofono
MMS_CONNMAN_BUILD_DIR = $(MMS_CONNMAN_DIR)/build
MMS_CONNMAN_DEBUG_LIB = $(MMS_CONNMAN_BUILD_DIR)/debug/$(MMS_CONNMAN_LIB)
MMS_CONNMAN_RELEASE_LIB = $(MMS_CONNMAN_BUILD_DIR)/release/$(MMS_CONNMAN_LIB)
#
# mms-handler-dbus
......@@ -96,7 +96,7 @@ DEBUG_DEFS = -DDEBUG
RELEASE_DEFS =
WARN = -Wall
CFLAGS = -fPIC $(shell pkg-config --cflags $(PKGS)) -I. -I$(GEN_DIR) \
-I$(MMS_LIB_DIR)/include -I$(MMS_OFONO_DIR)/include \
-I$(MMS_LIB_DIR)/include -I$(MMS_CONNMAN_DIR)/include \
-I$(MMS_HANDLER_DIR)/include -I$(MMS_SETTINGS_DIR)/include -MMD
ifndef KEEP_SYMBOLS
......@@ -117,13 +117,13 @@ RELEASE_CFLAGS = $(RELEASE_FLAGS) $(RELEASE_DEFS) $(CFLAGS)
LIBS = $(shell pkg-config --libs $(LIB_PKGS)) -lmagic -ljpeg $(RESIZE_LIBS)
DEBUG_LIBS = \
$(MMS_OFONO_DEBUG_LIB) \
$(MMS_CONNMAN_DEBUG_LIB) \
$(MMS_HANDLER_DEBUG_LIB) \
$(MMS_SETTINGS_DEBUG_LIB) \
$(MMS_LIB_DEBUG_LIB) \
$(LIBS)
RELEASE_LIBS = \
$(MMS_OFONO_RELEASE_LIB) \
$(MMS_CONNMAN_RELEASE_LIB) \
$(MMS_HANDLER_RELEASE_LIB) \
$(MMS_SETTINGS_RELEASE_LIB) \
$(MMS_LIB_RELEASE_LIB) \
......@@ -148,22 +148,22 @@ GEN_FILES = $(GEN_SRC:%=$(GEN_DIR)/%)
DEBUG_DEPS = \
mms_lib_debug_lib \
mms_ofono_debug_lib \
mms_connman_debug_lib \
mms_handler_debug_lib \
mms_settings_debug_lib
RELEASE_DEPS = \
mms_lib_release_lib \
mms_ofono_release_lib \
mms_connman_release_lib \
mms_handler_release_lib \
mms_settings_release_lib
DEBUG_EXE_DEPS = \
$(MMS_LIB_DEBUG_LIB) \
$(MMS_OFONO_DEBUG_LIB) \
$(MMS_CONNMAN_DEBUG_LIB) \
$(MMS_HANDLER_DEBUG_LIB) \
$(MMS_SETTINGS_DEBUG_LIB)
RELEASE_EXE_DEPS = \
$(MMS_LIB_RELEASE_LIB) \
$(MMS_OFONO_RELEASE_LIB) \
$(MMS_CONNMAN_RELEASE_LIB) \
$(MMS_HANDLER_RELEASE_LIB) \
$(MMS_SETTINGS_RELEASE_LIB)
DEPS = $(DEBUG_OBJS:%.o=%.d) $(RELEASE_OBJS:%.o=%.d)
......@@ -194,7 +194,7 @@ clean:
cleaner: clean
make -C $(MMS_LIB_DIR) $(SUBMAKE_OPTS) clean
make -C $(MMS_OFONO_DIR) $(SUBMAKE_OPTS) clean
make -C $(MMS_CONNMAN_DIR) $(SUBMAKE_OPTS) clean
make -C $(MMS_HANDLER_DIR) $(SUBMAKE_OPTS) clean
make -C $(MMS_SETTINGS_DIR) $(SUBMAKE_OPTS) clean
......@@ -213,11 +213,11 @@ mms_lib_debug_lib:
mms_lib_release_lib:
make -C $(MMS_LIB_DIR) $(SUBMAKE_OPTS) release
mms_ofono_debug_lib:
make -C $(MMS_OFONO_DIR) $(SUBMAKE_OPTS) debug
mms_connman_debug_lib:
make -C $(MMS_CONNMAN_DIR) $(SUBMAKE_OPTS) debug
mms_ofono_release_lib:
make -C $(MMS_OFONO_DIR) $(SUBMAKE_OPTS) release
mms_connman_release_lib:
make -C $(MMS_CONNMAN_DIR) $(SUBMAKE_OPTS) release
mms_handler_debug_lib:
make -C $(MMS_HANDLER_DIR) $(SUBMAKE_OPTS) debug
......@@ -235,9 +235,9 @@ $(MMS_LIB_DEBUG_LIB): mms_lib_debug_lib
$(MMS_LIB_RELEASE_LIB): mms_lib_release_lib
$(MMS_OFONO_DEBUG_LIB): mms_ofono_debug_lib
$(MMS_CONNMAN_DEBUG_LIB): mms_connman_debug_lib
$(MMS_OFONO_RELEASE_LIB): mms_ofono_release_lib
$(MMS_CONNMAN_RELEASE_LIB): mms_connman_release_lib
$(MMS_HANDLER_DEBUG_LIB): mms_handler_debug_lib
......
/*
* Copyright (C) 2013-2015 Jolla Ltd.
* Copyright (C) 2013-2016 Jolla Ltd.
* Contact: Slava Monich <slava.monich@jolla.com>
*
* This program is free software; you can redistribute it and/or modify
......@@ -17,7 +17,7 @@
#include <glib-unix.h>
#include "mms_engine.h"
#include "mms_ofono_log.h"
#include "mms_connman_ofono_log.h"
#include "mms_lib_log.h"
#include "mms_lib_util.h"
#include "mms_settings.h"
......@@ -41,7 +41,7 @@ static MMSLogModule* mms_app_log_modules[] = {
&mms_log_default,
#define MMS_LIB_LOG_MODULE(m) &(m),
MMS_LIB_LOG_MODULES(MMS_LIB_LOG_MODULE)
MMS_OFONO_LOG_MODULES(MMS_LIB_LOG_MODULE)
MMS_CONNMAN_LOG_MODULES(MMS_LIB_LOG_MODULE)
#undef MMS_LIB_LOG_MODULE
};
......
......@@ -4,10 +4,11 @@ PKGCONFIG += gmime-2.6 gio-unix-2.0 gio-2.0 glib-2.0 libsoup-2.4 dconf
PKGCONFIG += libwspcodec libgofono libglibutil
DBUS_INTERFACE_DIR = $$_PRO_FILE_PWD_
MMS_LIB_DIR = $$_PRO_FILE_PWD_/../mms-lib
MMS_OFONO_DIR = $$_PRO_FILE_PWD_/../mms-ofono
MMS_CONNMAN = mms-connman-ofono
MMS_CONNMAN_DIR = $$_PRO_FILE_PWD_/../$$MMS_CONNMAN
MMS_HANDLER_DIR = $$_PRO_FILE_PWD_/../mms-handler-dbus
MMS_SETTINGS_DIR = $$_PRO_FILE_PWD_/../mms-settings-dconf
INCLUDEPATH += $$MMS_OFONO_DIR/include
INCLUDEPATH += $$MMS_CONNMAN_DIR/include
INCLUDEPATH += $$MMS_LIB_DIR/include
INCLUDEPATH += $$MMS_HANDLER_DIR/include
INCLUDEPATH += $$MMS_SETTINGS_DIR/include
......@@ -34,13 +35,13 @@ OTHER_FILES += \
CONFIG(debug, debug|release) {
DEFINES += DEBUG
DESTDIR = $$_PRO_FILE_PWD_/build/debug
LIBS += $$MMS_OFONO_DIR/build/debug/libmms-ofono.a
LIBS += $$MMS_CONNMAN_DIR/build/debug/lib$${MMS_CONNMAN}.a
LIBS += $$MMS_HANDLER_DIR/build/debug/libmms-handler-dbus.a
LIBS += $$MMS_LIB_DIR/build/debug/libmms-lib.a
LIBS += $$MMS_SETTINGS_DIR/build/debug/libmms-settings-dconf.a
} else {
DESTDIR = $$_PRO_FILE_PWD_/build/release
LIBS += $$MMS_OFONO_DIR/build/release/libmms-ofono.a
LIBS += $$MMS_CONNMAN_DIR/build/release/lib$${MMS_CONNMAN}.a
LIBS += $$MMS_HANDLER_DIR/build/release/libmms-handler-dbus.a
LIBS += $$MMS_LIB_DIR/build/release/libmms-lib.a
LIBS += $$MMS_SETTINGS_DIR/build/release/libmms-settings-dconf.a
......
/*
* Copyright (C) 2013-2015 Jolla Ltd.
* Copyright (C) 2013-2016 Jolla Ltd.
* Contact: Slava Monich <slava.monich@jolla.com>
*
* This program is free software; you can redistribute it and/or modify
......@@ -17,7 +17,7 @@
#include "mms_dispatcher.h"
#include "mms_settings.h"
#include "mms_lib_util.h"
#include "mms_ofono_connman.h"
#include "mms_connman_ofono.h"
#include "mms_handler_dbus.h"
#include "mms_settings_dconf.h"
#include "mms_log.h"
......
......@@ -2,8 +2,8 @@ TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS += \
mms-lib \
mms-connman-ofono \
mms-handler-dbus \
mms-ofono \
mms-settings-dconf \
mms-engine \
mms-dump \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment