[mms-engine] Resolved MMS_VERSION conflict

The one defined on the command line conflicted with the one defined in mms_task.h
sailfishos · Apr 22, 2014 · 318abad · 318abad
1 parent 12fc2ed
commit 318abad
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/mms-engine/Makefile b/mms-engine/Makefile
@@ -96,8 +96,8 @@ RELEASE_FLAGS += -g
 SUBMAKE_OPTS += KEEP_SYMBOLS=1
 endif
 
-ifdef MMS_VERSION
-CFLAGS += -DMMS_VERSION="$(MMS_VERSION)"
+ifdef MMS_ENGINE_VERSION
+CFLAGS += -DMMS_ENGINE_VERSION="$(MMS_ENGINE_VERSION)"
 endif
 
 DEBUG_CFLAGS = $(DEBUG_FLAGS) $(DEBUG_DEFS) $(CFLAGS)

diff --git a/mms-engine/main.c b/mms-engine/main.c
@@ -157,7 +157,7 @@ mms_app_parse_options(
     gboolean ok;
     GError* error = NULL;
     gboolean session_bus = FALSE;
-#ifdef MMS_VERSION
+#ifdef MMS_ENGINE_VERSION
     gboolean print_version = FALSE;
 #endif
     gint size_limit_kb = opt->config.size_limit/1024;
@@ -209,7 +209,7 @@ mms_app_parse_options(
           "Log output (stdout|syslog|glib) [stdout]", "TYPE" },
         { "log-level", 'l', 0, G_OPTION_ARG_CALLBACK, mms_app_option_loglevel,
           "Set log level (repeatable)", "[MODULE:]LEVEL" },
-#ifdef MMS_VERSION
+#ifdef MMS_ENGINE_VERSION
         { "version", 0, 0, G_OPTION_ARG_NONE, &print_version,
           "Print program version and exit", NULL },
 #endif
@@ -228,11 +228,11 @@ mms_app_parse_options(
     g_free(megapixels_help);
     g_free(description);
 
-#ifdef MMS_VERSION
+#ifdef MMS_ENGINE_VERSION
 #  define MMS_STRING__(x) #x
 #  define MMS_STRING_(x) MMS_STRING__(x)
     if (print_version) {
-        printf("MMS engine %s\n", MMS_STRING_(MMS_VERSION));
+        printf("MMS engine %s\n", MMS_STRING_(MMS_ENGINE_VERSION));
         *result = RET_OK;
         return FALSE;
     } else

diff --git a/rpm/mms-engine.spec b/rpm/mms-engine.spec
@@ -46,7 +46,7 @@ MMS command line utilities
 %setup -q -n %{name}-%{version}
 
 %build
-make -C %{src} KEEP_SYMBOLS=1 MMS_VERSION="%{version}" release
+make -C %{src} KEEP_SYMBOLS=1 MMS_ENGINE_VERSION="%{version}" release
 make -C mms-dump KEEP_SYMBOLS=1 release
 make -C mms-send KEEP_SYMBOLS=1 release