[mms-engine] Use SAILFISH macro to select mms_connman_nemo implementa…

…tion MMS_CONNMAN_NEMO defined from the command line conflicted with the macro defined in mms_connman_nemo.c
sailfishos · Mar 7, 2016 · a2b71f7 · a2b71f7
1 parent 1bf86f0
commit a2b71f7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/mms-engine/Makefile b/mms-engine/Makefile
@@ -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)

diff --git a/mms-engine/main.c b/mms-engine/main.c
@@ -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"

diff --git a/mms-engine/mms-engine.pro b/mms-engine/mms-engine.pro
@@ -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

diff --git a/mms-engine/mms_engine.c b/mms-engine/mms_engine.c
@@ -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

diff --git a/rpm/mms-engine.spec b/rpm/mms-engine.spec
@@ -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