From 0b113da51298fbbf277d8a9ef34c326a94c2436b Mon Sep 17 00:00:00 2001
From: Amarnath Valluri <amarnath.valluri@linux.intel.com>
Date: Tue, 15 Oct 2013 19:56:24 +0300
Subject: [PATCH] dristibute single shared shared library: libmessage-port.so

---
 common/Makefile.am | 35 +++++++++++++++++++++++++++++------
 daemon/Makefile.am |  2 +-
 lib/Makefile.am    |  2 +-
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/common/Makefile.am b/common/Makefile.am
index 82f0fea..0af6258 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libmessageport-dbus-glue.la 
+noinst_LTLIBRARIES = libmessageport-dbus-glue.la  libmessageport-common.la
 NULL = 
 
 dbus-manager-glue.c dbus-maanager-glue.h : org.tizen.messageport.Manager.xml
@@ -15,20 +15,43 @@ dbus-service-glue.c dbus-service-glue.h : org.tizen.messageport.Service.xml
         --generate-c-code  dbus-service-glue     \
         $<
 
-nodist_libmessageport_dbus_glue_la_SOURCES = \
+#
+# libmessageport-dbus-glue.la
+#
+libmessageport_dbus_glue_la_SOURCES = \
     dbus-manager-glue.h \
     dbus-manager-glue.c \
     dubs-service-glue.h \
     dbus-service-glue.c \
-    dbus-error.h \
-    dbus-error.c \
     $(NULL)
     
 libmessageport_dbus_glue_la_CPPFLAGS = \
     -I$(top_builddir) \
-    $(GLIB_CFLAGS) $(GIO_CFLAGS) $(GIOUNIX_CFLAGS)
+    $(GLIB_CFLAGS) $(GIO_CFLAGS) $(GIOUNIX_CFLAGS) \
+    $(NULL)
 
 libmessageport_dbus_glue_la_LIBADD = \
-    $(GLIB_LIBS) $(GIO_LIBS) $(GIOUNIX_LIBS)
+    $(GLIB_LIBS) $(GIO_LIBS) $(GIOUNIX_LIBS) \
+    $(NULL)
+
+
+#
+# libmessageport-common.la
+#
+libmessageport_common_la_SOURCES = \
+    -I$(top_builddir) \
+    dbus-error.h \
+    dbus-error.c \
+    $(NULL)
+
+libmessageport_common_la_CPPFLAGS = \
+    -I$(top_builddir) \
+    $(GLIB_CFLAGS) $(GIO_CFLAGS) $(GIOUNIX_CFLAGS) \
+    $(NULL)
+
+libmessageport_common_la_LIBADD = \
+    ./libmessageport-dbus-glue.la \
+    $(GLIB_LIBS) $(GIO_LIBS) $(GIOUNIX_LIBS) \
+    $(NULL)
 
 CLEANFILES = 
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 1cb6548..b14d22b 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -19,7 +19,7 @@ messageportd_CPPFLAGS = \
     $(NULL)
 
 messageportd_LDADD = \
-    ../common/libmessageport-dbus-glue.la \
+    ../common/libmessageport-common.la \
     $(GLIB_LIBS) $(GIO_LIBS) $(AUL_LIBS) $(PKGMGRINFO_LIBS) \
     $(NULL)
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 85fa812..a6d937b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -24,7 +24,7 @@ libmessage_port_la_CPPFLAGS = \
     $(NULL)
 
 libmessage_port_la_LIBADD = \
-    ../common/libmessageport-dbus-glue.la \
+    ../common/libmessageport-common.la \
     $(GLIB_LIBS) $(GIO_LIBS) $(BUNDLE_LIBS)
 
 
-- 
2.7.4