From 62b1cf40d5c7c8dd5a2297f387a45f90f114054d Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Mon, 10 Dec 2012 22:48:44 +0100 Subject: [PATCH] build: Move SAP plugin definition next to all other plugins --- Makefile.am | 12 ------------ Makefile.plugins | 9 +++++++++ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Makefile.am b/Makefile.am index 488a3f92e..b91d97944 100644 --- a/Makefile.am +++ b/Makefile.am @@ -111,18 +111,6 @@ builtin_nodist = include Makefile.plugins -if EXPERIMENTAL -builtin_modules += sap -builtin_sources += profiles/sap/main.c profiles/sap/manager.h \ - profiles/sap/manager.c profiles/sap/server.h \ - profiles/sap/server.c profiles/sap/sap.h \ - profiles/sap/sap-dummy.c - -noinst_LIBRARIES += profiles/sap/libsap.a - -profiles_sap_libsap_a_SOURCES = profiles/sap/sap.h profiles/sap/sap-u8500.c -endif - if MAINTAINER_MODE plugin_LTLIBRARIES += plugins/external-dummy.la plugins_external_dummy_la_SOURCES = plugins/external-dummy.c diff --git a/Makefile.plugins b/Makefile.plugins index a4442f3ce..bdd5d59e7 100644 --- a/Makefile.plugins +++ b/Makefile.plugins @@ -20,6 +20,15 @@ builtin_sources += plugins/dbusoob.c builtin_modules += neard builtin_sources += plugins/neard.c + +builtin_modules += sap +builtin_sources += profiles/sap/main.c profiles/sap/manager.h \ + profiles/sap/manager.c profiles/sap/server.h \ + profiles/sap/server.c profiles/sap/sap.h \ + profiles/sap/sap-dummy.c + +noinst_LIBRARIES += profiles/sap/libsap.a +profiles_sap_libsap_a_SOURCES = profiles/sap/sap.h profiles/sap/sap-u8500.c endif builtin_modules += audio -- 2.47.3