src/Makefile.am: simplify build template

Rewrite Makefile.am to remove files duplication, flags duplication and
unused libraries.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Change-Id: Ieb13cde575da6a4ed1041c417675298012d66244

1 files changed, 28 insertions, 60 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 6990353..f3c9b61 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,9 @@
-adsprpcdir = $(libdir)
-ADSP_CFLAGS = -fno-short-enums -U_DEBUG -DARM_ARCH_7A -DLE_ENABLE -DUSE_SYSLOG -Iinc -Isrc -DDEFAULT_DOMAIN_ID=0
+lib_LTLIBRARIES =
 
-adsprpc_LTLIBRARIES = libadsprpc.la
-libadsprpc_la_SOURCES = fastrpc_apps_user.c \
+LIBDSPRPC_CFLAGS = -fno-short-enums -U_DEBUG -DARM_ARCH_7A -DLE_ENABLE -DUSE_SYSLOG -I$(top_srcdir)/inc
+
+LIBDSPRPC_SOURCES = \
+		fastrpc_apps_user.c \
 		remotectl_stub.c \
 		listener_android.c \
 		adsp_current_process_stub.c \
@@ -35,70 +36,37 @@ libadsprpc_la_SOURCES = fastrpc_apps_user.c \
 		fastrpc_perf.c \
 		mod_table.c
 
-libadsprpc_la_LDFLAGS = -ldl -lpthread -lm -shared
-libadsprpc_la_CFLAGS = -I$(top_srcdir)/inc $(ADSP_CFLAGS)
-
-adsplistenerdir = $(libdir)
-adsplistener_LTLIBRARIES = libadsp_default_listener.la
-libadsp_default_listener_la_SOURCES = adsp_default_listener.c \
+LIBDEFAULT_LISTENER_SOURCES = \
+				adsp_default_listener.c \
 				adsp_default_listener_stub.c \
 				std.c \
 				std_mem.c
-libadsp_default_listener_la_DEPENDENCIES = libadsprpc.la
-libadsp_default_listener_la_LDFLAGS = $(top_builddir)/src/libadsprpc.la -ldl -lpthread -lm -shared
-libadsp_default_listener_la_CFLAGS = -I$(top_srcdir)/inc $(ADSP_CFLAGS)
 
-cdsprpcdir = $(libdir)
+ADSP_CFLAGS = $(LIBDSPRPC_CFLAGS) -DDEFAULT_DOMAIN_ID=0
 
-CDSP_CFLAGS = -fno-short-enums -U_DEBUG -DARM_ARCH_7A -DLE_ENABLE -DUSE_SYSLOG -Iinc -Isrc -DDEFAULT_DOMAIN_ID=3
+lib_LTLIBRARIES += libadsprpc.la
+libadsprpc_la_SOURCES = $(LIBDSPRPC_SOURCES)
+libadsprpc_la_LDFLAGS = -ldl -lpthread -lm
+libadsprpc_la_CFLAGS = $(ADSP_CFLAGS)
 
-cdsprpc_LTLIBRARIES = libcdsprpc.la
-libcdsprpc_la_SOURCES = fastrpc_apps_user.c \
-		remotectl_stub.c \
-		listener_android.c \
-		adsp_current_process_stub.c \
-		adsp_current_process1_stub.c \
-		apps_std_skel.c \
-		apps_std_imp.c \
-		apps_mem_imp.c \
-		apps_mem_skel.c \
-		rpcmem_android.c \
-		apps_remotectl_skel.c \
-		std.c \
-		std_path.c \
-		std_mem.c \
-		std_dtoa.c \
-		std_strlprintf.c \
-		BufBound.c \
-		std_SwapBytes.c \
-		smath.c \
-		atomic.c \
-		cae.c \
-		adspmsgd_apps_skel.c \
-		adspmsgd_adsp_stub.c \
-		adspmsgd_adsp1_stub.c \
-		adspmsgd_apps.c \
-		platform_libs.c \
-		pl_list.c \
-		log_config.c \
-		gpls.c \
-		adsp_perf_stub.c \
-		fastrpc_perf.c \
-		mod_table.c
+lib_LTLIBRARIES += libadsp_default_listener.la
+libadsp_default_listener_la_SOURCES = $(LIBDEFAULT_LISTENER_SOURCES)
+libadsp_default_listener_la_DEPENDENCIES = libadsprpc.la
+libadsp_default_listener_la_LDFLAGS = libadsprpc.la -shared -module -avoid-version
+libadsp_default_listener_la_CFLAGS = $(ADSP_CFLAGS)
 
-libcdsprpc_la_LDFLAGS = -ldl -lpthread -lm -shared
-libcdsprpc_la_CFLAGS = -I$(top_srcdir)/inc $(CDSP_CFLAGS)
+CDSP_CFLAGS = $(LIBDSPRPC_CFLAGS) -DDEFAULT_DOMAIN_ID=3
 
-cdsplistenerdir = $(libdir)
-cdsplistener_LTLIBRARIES = libcdsp_default_listener.la
-libcdsp_default_listener_la_SOURCES = adsp_default_listener.c \
-				adsp_default_listener_stub.c \
-				std.c \
-				std_mem.c
+lib_LTLIBRARIES += libcdsprpc.la
+libcdsprpc_la_SOURCES = $(LIBDSPRPC_SOURCES)
+libcdsprpc_la_LDFLAGS = -ldl -lpthread -lm
+libcdsprpc_la_CFLAGS = $(CDSP_CFLAGS)
 
+lib_LTLIBRARIES += libcdsp_default_listener.la
+libcdsp_default_listener_la_SOURCES = $(LIBDEFAULT_LISTENER_SOURCES)
 libcdsp_default_listener_la_DEPENDENCIES = libcdsprpc.la
-libcdsp_default_listener_la_LDFLAGS = $(top_builddir)/src/libcdsprpc.la -ldl -lpthread -lm -shared
-libcdsp_default_listener_la_CFLAGS = -I$(top_srcdir)/inc  $(CDSP_CFLAGS)
+libcdsp_default_listener_la_LDFLAGS = libcdsprpc.la -shared -module -avoid-version
+libcdsp_default_listener_la_CFLAGS = $(CDSP_CFLAGS)
 
 bin_PROGRAMS = adsprpcd cdsprpcd
 
@@ -106,12 +74,12 @@ adsprpcddir = $(libdir)
 adsprpcd_SOURCES = adsprpcd.c
 adsprpcd_DEPENDENCIES = libadsp_default_listener.la
 adsprpcd_CFLAGS = -I$(top_srcdir)/inc -DDEFAULT_DOMAIN_ID=0
-adsprpcd_LDADD =  $(top_builddir)/src/libadsp_default_listener.la -lpthread -lm -ldl
+adsprpcd_LDADD = -ldl
 
 
 cdsprpcddir = $(libdir)
 cdsprpcd_SOURCES = cdsprpcd.c
 cdsprpcd_DEPENDENCIES = libcdsp_default_listener.la
 cdsprpcd_CFLAGS = -I$(top_srcdir)/inc -DDEFAULT_DOMAIN_ID=3
-cdsprpcd_LDADD =  $(top_builddir)/src/libcdsp_default_listener.la -lpthread -lm -ldl
+cdsprpcd_LDADD =  -ldl