From fd6b49c03d26cd137e76a198ea1f121ccf27d7e6 Mon Sep 17 00:00:00 2001
From: Slava Monich <slava.monich@jolla.com>
Date: Tue, 18 Feb 2014 13:12:30 +0200
Subject: [PATCH] Build debuginfo package

---
 mms-engine/Makefile       | 33 ++++++++++++++++++++++-----------
 mms-handler-dbus/Makefile | 19 +++++++++++++++----
 mms-lib/Makefile          | 21 +++++++++++++++++----
 mms-ofono/Makefile        | 17 +++++++++++++----
 rpm/mms-engine.spec       |  2 +-
 5 files changed, 68 insertions(+), 24 deletions(-)

diff --git a/mms-engine/Makefile b/mms-engine/Makefile
index 112893a..4e0e0f5 100644
--- a/mms-engine/Makefile
+++ b/mms-engine/Makefile
@@ -1,4 +1,4 @@
-# -*- Mode: makefile -*-
+# -*- Mode: gnu-makefile -*-
 
 .PHONY: all debug release clean cleaner
 .PHONY: mms_lib_debug_lib mms_lib_release_lib
@@ -78,6 +78,15 @@ CFLAGS = $(shell pkg-config --cflags $(PKGS)) -I. -I$(GEN_DIR) \
  -I$(MMS_LIB_DIR)/include -I$(MMS_OFONO_DIR)/include \
  -I$(MMS_HANDLER_DIR)/include -MMD
 
+ifndef KEEP_SYMBOLS
+KEEP_SYMBOLS = 0
+endif
+
+ifneq ($(KEEP_SYMBOLS),0)
+RELEASE_FLAGS += -g
+SUBMAKE_OPTS += KEEP_SYMBOLS=1
+endif
+
 DEBUG_CFLAGS = $(DEBUG_FLAGS) $(DEBUG_DEFS) $(CFLAGS)
 RELEASE_CFLAGS = $(RELEASE_FLAGS) $(RELEASE_DEFS) $(CFLAGS)
 
@@ -151,9 +160,9 @@ clean:
 	rm -fr $(BUILD_DIR) $(SRC_DIR)/*~
 
 cleaner: clean
-	make -C $(MMS_LIB_DIR) clean
-	make -C $(MMS_OFONO_DIR) clean
-	make -C $(MMS_HANDLER_DIR) clean
+	make -C $(MMS_LIB_DIR) $(SUBMAKE_OPTS) clean
+	make -C $(MMS_OFONO_DIR) $(SUBMAKE_OPTS) clean
+	make -C $(MMS_HANDLER_DIR) $(SUBMAKE_OPTS) clean
 
 $(GEN_DIR):
 	mkdir -p $@
@@ -165,22 +174,22 @@ $(RELEASE_BUILD_DIR):
 	mkdir -p $@
 
 mms_lib_debug_lib:
-	make -C $(MMS_LIB_DIR) debug
+	make -C $(MMS_LIB_DIR) $(SUBMAKE_OPTS) debug
 
 mms_lib_release_lib:
-	make -C $(MMS_LIB_DIR) release
+	make -C $(MMS_LIB_DIR) $(SUBMAKE_OPTS) release
 
 mms_ofono_debug_lib:
-	make -C $(MMS_OFONO_DIR) debug
+	make -C $(MMS_OFONO_DIR) $(SUBMAKE_OPTS) debug
 
 mms_ofono_release_lib:
-	make -C $(MMS_OFONO_DIR) release
+	make -C $(MMS_OFONO_DIR) $(SUBMAKE_OPTS) release
 
 mms_handler_debug_lib:
-	make -C $(MMS_HANDLER_DIR) debug
+	make -C $(MMS_HANDLER_DIR) $(SUBMAKE_OPTS) debug
 
 mms_handler_release_lib:
-	make -C $(MMS_HANDLER_DIR) release
+	make -C $(MMS_HANDLER_DIR) $(SUBMAKE_OPTS) release
 
 $(MMS_LIB_DEBUG_LIB): mms_lib_debug_lib
 
@@ -214,4 +223,6 @@ $(DEBUG_EXE): $(DEBUG_EXE_DEPS) $(DEBUG_OBJS)
 
 $(RELEASE_EXE): $(RELEASE_EXE_DEPS) $(RELEASE_OBJS)
 	$(LD) $(RELEASE_FLAGS) $(RELEASE_OBJS) $(RELEASE_LIBS) -o $@
-#	strip $@
+ifeq ($(KEEP_SYMBOLS),0)
+	strip $@
+endif
diff --git a/mms-handler-dbus/Makefile b/mms-handler-dbus/Makefile
index 82981e6..37049b3 100644
--- a/mms-handler-dbus/Makefile
+++ b/mms-handler-dbus/Makefile
@@ -1,4 +1,4 @@
-# -*- Mode: makefile -*-
+# -*- Mode: gnu-makefile -*-
 
 .PHONY: clean all debug release
 
@@ -37,12 +37,23 @@ RELEASE_BUILD_DIR = $(BUILD_DIR)/release
 
 CC = $(CROSS_COMPILE)gcc
 LD = $(CC)
-WARN = -Wall
 ARFLAGS = rc
-INCLUDES = -I$(SRC_DIR) -I$(INCLUDE_DIR) -I$(MMS_LIB_INCLUDE) -I$(GEN_DIR) -I.
-CFLAGS = $(WARNINGS) $(INCLUDES) $(shell pkg-config --cflags $(PKGS)) -MMD
 DEBUG_FLAGS = -g
 RELEASE_FLAGS = -O2
+DEBUG_DEFS = -DDEBUG
+RELEASE_DEFS =
+WARNINGS = -Wall
+INCLUDES = -I$(SRC_DIR) -I$(INCLUDE_DIR) -I$(MMS_LIB_INCLUDE) -I$(GEN_DIR) -I.
+CFLAGS += $(WARNINGS) $(INCLUDES) $(shell pkg-config --cflags $(PKGS)) -MMD
+
+ifndef KEEP_SYMBOLS
+KEEP_SYMBOLS = 0
+endif
+
+ifneq ($(KEEP_SYMBOLS),0)
+RELEASE_FLAGS += -g
+endif
+
 DEBUG_CFLAGS = $(DEBUG_FLAGS) $(DEBUG_DEFS) $(CFLAGS)
 RELEASE_CFLAGS = $(RELEASE_FLAGS) $(RELEASE_DEFS) $(CFLAGS)
 
diff --git a/mms-lib/Makefile b/mms-lib/Makefile
index cbf15e0..0699546 100644
--- a/mms-lib/Makefile
+++ b/mms-lib/Makefile
@@ -1,4 +1,4 @@
-# -*- Mode: makefile -*-
+# -*- Mode: gnu-makefile -*-
 
 .PHONY: clean all debug release
 
@@ -49,12 +49,25 @@ endif
 
 CC = $(CROSS_COMPILE)gcc
 LD = $(CC)
+ARFLAGS = rc
+DEBUG_FLAGS = -g
+RELEASE_FLAGS = -O2
+DEBUG_DEFS = -DDEBUG
+RELEASE_DEFS =
 WARNINGS = -Wall
 INCLUDES = -I$(SRC_DIR) -I$(INCLUDE_DIR)
 CFLAGS += $(WARNINGS) $(INCLUDES) $(shell pkg-config --cflags $(PKGS)) -MMD
-DEBUG_CFLAGS = -g -DDEBUG $(CFLAGS)
-RELEASE_CFLAGS = -O2 $(CFLAGS)
-ARFLAGS = rc
+
+ifndef KEEP_SYMBOLS
+KEEP_SYMBOLS = 0
+endif
+
+ifneq ($(KEEP_SYMBOLS),0)
+RELEASE_FLAGS += -g
+endif
+
+DEBUG_CFLAGS = $(DEBUG_FLAGS) $(DEBUG_DEFS) $(CFLAGS)
+RELEASE_CFLAGS = $(RELEASE_FLAGS) $(RELEASE_DEFS) $(CFLAGS)
 
 #
 # Files
diff --git a/mms-ofono/Makefile b/mms-ofono/Makefile
index acce7d1..e2beb25 100644
--- a/mms-ofono/Makefile
+++ b/mms-ofono/Makefile
@@ -1,4 +1,4 @@
-# -*- Mode: makefile -*-
+# -*- Mode: gnu-makefile -*-
 
 .PHONY: clean all debug release
 
@@ -47,14 +47,23 @@ RELEASE_BUILD_DIR = $(BUILD_DIR)/release
 
 CC = $(CROSS_COMPILE)gcc
 LD = $(CC)
-WARN = -Wall
 ARFLAGS = rc
-INCLUDES = -I$(SRC_DIR) -I$(INCLUDE_DIR) -I$(MMS_LIB_INCLUDE) -I$(GEN_DIR) -I.
-CFLAGS = $(INCLUDES) $(shell pkg-config --cflags $(PKGS)) -MMD
 DEBUG_FLAGS = -g
 RELEASE_FLAGS = -O2
 DEBUG_DEFS = -DDEBUG
 RELEASE_DEFS =
+WARNINGS = -Wall
+INCLUDES = -I$(SRC_DIR) -I$(INCLUDE_DIR) -I$(MMS_LIB_INCLUDE) -I$(GEN_DIR) -I.
+CFLAGS += $(WARNINGS) $(INCLUDES) $(shell pkg-config --cflags $(PKGS)) -MMD
+
+ifndef KEEP_SYMBOLS
+KEEP_SYMBOLS = 0
+endif
+
+ifneq ($(KEEP_SYMBOLS),0)
+RELEASE_FLAGS += -g
+endif
+
 DEBUG_CFLAGS = $(DEBUG_FLAGS) $(DEBUG_DEFS) $(CFLAGS)
 RELEASE_CFLAGS = $(RELEASE_FLAGS) $(RELEASE_DEFS) $(CFLAGS)
 
diff --git a/rpm/mms-engine.spec b/rpm/mms-engine.spec
index 45c723a..01f580b 100644
--- a/rpm/mms-engine.spec
+++ b/rpm/mms-engine.spec
@@ -32,7 +32,7 @@ MMS engine
 %setup -q -n %{name}-%{version}
 
 %build
-make -C %{src} release
+make -C %{src} KEEP_SYMBOLS=1 release
 
 %install
 rm -rf %{buildroot}