Commit a2b71f7e authored by Slava Monich's avatar Slava Monich

[mms-engine] Use SAILFISH macro to select mms_connman_nemo implementation

MMS_CONNMAN_NEMO defined from the command line conflicted with the macro
defined in mms_connman_nemo.c
parent 1bf86f0e
......@@ -19,7 +19,7 @@ include ../mms-lib/Config.mak
PKGS = gio-unix-2.0 gio-2.0 libglibutil
LIB_PKGS = libwspcodec gmime-2.6 libgofono libsoup-2.4 dconf
ifdef MMS_CONNMAN_NEMO
ifdef SAILFISH
LIB_PKGS += libgofonoext
endif
......@@ -63,7 +63,7 @@ MMS_LIB_RELEASE_LIB = $(MMS_LIB_BUILD_DIR)/release/$(MMS_LIB_LIB)
# mms-connman
#
ifdef MMS_CONNMAN_NEMO
ifdef SAILFISH
MMS_CONNMAN = nemo
else
MMS_CONNMAN = ofono
......@@ -122,8 +122,8 @@ ifdef MMS_ENGINE_VERSION
CFLAGS += -DMMS_ENGINE_VERSION="$(MMS_ENGINE_VERSION)"
endif
ifdef MMS_CONNMAN_NEMO
CFLAGS += -DMMS_CONNMAN_NEMO
ifdef SAILFISH
CFLAGS += -DSAILFISH
endif
DEBUG_CFLAGS = $(DEBUG_FLAGS) $(DEBUG_DEFS) $(CFLAGS)
......
......@@ -21,7 +21,7 @@
#include "mms_lib_util.h"
#include "mms_settings.h"
#ifdef MMS_CONNMAN_NEMO
#ifdef SAILFISH
# include "mms_connman_nemo_log.h"
#else
# include "mms_connman_ofono_log.h"
......
......@@ -13,7 +13,7 @@ ResizeImageMagick {
ConnManNemo {
PKGCONFIG += libgofonoext
DEFINES += MMS_CONNMAN_NEMO
DEFINES += SAILFISH
MMS_CONNMAN = mms-connman-nemo
} else {
MMS_CONNMAN = mms-connman-ofono
......
......@@ -21,7 +21,7 @@
#include "mms_settings_dconf.h"
#include "mms_log.h"
#ifdef MMS_CONNMAN_NEMO
#ifdef SAILFISH
# include "mms_connman_nemo.h"
# define mms_connman_new() mms_connman_nemo_new()
#else
......
......@@ -55,7 +55,7 @@ MMS command line utilities
%setup -q -n %{name}-%{version}
%build
make -C %{src} KEEP_SYMBOLS=1 MMS_CONNMAN_NEMO=1 MMS_ENGINE_VERSION="%{version}" release
make -C %{src} KEEP_SYMBOLS=1 MMS_ENGINE_VERSION="%{version}" SAILFISH=1 release
make -C mms-dump KEEP_SYMBOLS=1 release
make -C mms-send KEEP_SYMBOLS=1 release
......
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