14 files changed, 77 insertions, 17 deletions
diff --git a/plugins/afm-main-plugin/CMakeLists.txt b/plugins/afm-main-plugin/CMakeLists.txt
index 5ed1d4b2..6da0e915 100644
--- a/plugins/afm-main-plugin/CMakeLists.txt
+++ b/plugins/afm-main-plugin/CMakeLists.txt
@@ -1,7 +1,20 @@
 
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(libsystemd REQUIRED libsystemd>=222)
+
+INCLUDE_DIRECTORIES(
+	${INCLUDE_DIRS}
+	${libsystemd_INCLUDE_DIRS}
+)
+
+
 ADD_LIBRARY(afm-main-api MODULE afm-main-plugin.c utils-jbus.c)
-SET_TARGET_PROPERTIES(afm-main-api PROPERTIES PREFIX "")
-TARGET_LINK_LIBRARIES(afm-main-api ${link_libraries})
+SET_TARGET_PROPERTIES(afm-main-api PROPERTIES
+	PREFIX ""
+	LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export.map"
+)
+
+TARGET_LINK_LIBRARIES(afm-main-api ${link_libraries} ${libsystemd_LIBRARIES})
 INCLUDE_DIRECTORIES(${include_dirs})
 INSTALL(TARGETS afm-main-api
           LIBRARY DESTINATION ${plugin_install_dir})
diff --git a/plugins/afm-main-plugin/export.map b/plugins/afm-main-plugin/export.map
new file mode 100644
index 00000000..e2da85ca
--- /dev/null
+++ b/plugins/afm-main-plugin/export.map
@@ -0,0 +1 @@
+{ global: pluginAfbV1Register; local: *; };
diff --git a/plugins/audio/CMakeLists.txt b/plugins/audio/CMakeLists.txt
index ee858b4c..2d74fd62 100644
--- a/plugins/audio/CMakeLists.txt
+++ b/plugins/audio/CMakeLists.txt
@@ -1,13 +1,26 @@
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(alsa alsa)
+PKG_CHECK_MODULES(pulseaudio libpulse libpulse-simple)
+INCLUDE(FindThreads)
+FIND_PACKAGE(Threads)
+
 IF(alsa_FOUND)
 
+  MESSAGE(STATUS "ALSA found ; will compile Audio plugin... (PLUGIN)")
+
   IF(pulseaudio_FOUND)
+    MESSAGE(STATUS "PulseAudio found ; Audio plugin will have PulseAudio support")
+    ADD_DEFINITIONS(-DHAVE_PULSE=1)
     SET(pulse_sources audio-pulse.c)
   ENDIF(pulseaudio_FOUND)
 
+  INCLUDE_DIRECTORIES(${include_dirs} ${alsa_INCLUDE_DIRS} ${pulseaudio_INCLUDE_DIRS})
   ADD_LIBRARY(audio-api MODULE audio-api.c audio-alsa.c ${pulse_sources})
-  SET_TARGET_PROPERTIES(audio-api PROPERTIES PREFIX "")
-  TARGET_LINK_LIBRARIES(audio-api ${link_libraries})
-  INCLUDE_DIRECTORIES(${include_dirs})
+  SET_TARGET_PROPERTIES(audio-api PROPERTIES
+	PREFIX ""
+	LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export.map"
+  )
+  TARGET_LINK_LIBRARIES(audio-api ${link_libraries} ${alsa_LIBRARIES} ${pulseaudio_LIBRARIES})
   INSTALL(TARGETS audio-api
           LIBRARY DESTINATION ${plugin_install_dir})
 
diff --git a/plugins/audio/audio-api.c b/plugins/audio/audio-api.c
index 4eeed92d..8956f809 100644
--- a/plugins/audio/audio-api.c
+++ b/plugins/audio/audio-api.c
@@ -349,7 +349,7 @@ static const struct AFB_plugin pluginDesc = {
     }
 };
 
-const struct AFB_plugin *pluginAfbV1Entry (const struct AFB_interface *itf)
+const struct AFB_plugin *pluginAfbV1Register (const struct AFB_interface *itf)
 {
 	return &pluginDesc;
 }
diff --git a/plugins/audio/export.map b/plugins/audio/export.map
new file mode 100644
index 00000000..e2da85ca
--- /dev/null
+++ b/plugins/audio/export.map
@@ -0,0 +1 @@
+{ global: pluginAfbV1Register; local: *; };
diff --git a/plugins/media/CMakeLists.txt b/plugins/media/CMakeLists.txt
index a6fc34ed..5febc02d 100644
--- a/plugins/media/CMakeLists.txt
+++ b/plugins/media/CMakeLists.txt
@@ -1,9 +1,17 @@
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(gupnp gupnp-1.0 gupnp-av-1.0 gssdp-1.0 gobject-2.0 gio-2.0)
+
 IF(gupnp_FOUND)
 
+  MESSAGE(STATUS "gupnp found ; will compile Media plugin... (PLUGIN)")
+
+  INCLUDE_DIRECTORIES( ${include_dirs} ${gupnp_INCLUDE_DIRS})
   ADD_LIBRARY(media-api MODULE media-api.c media-rygel.c)
-  SET_TARGET_PROPERTIES(media-api PROPERTIES PREFIX "")
-  TARGET_LINK_LIBRARIES(media-api ${link_libraries})
-  INCLUDE_DIRECTORIES(${include_dirs})
+  SET_TARGET_PROPERTIES(media-api PROPERTIES
+	PREFIX ""
+	LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export.map"
+  )
+  TARGET_LINK_LIBRARIES(media-api ${link_libraries} ${gupnp_LIBRARIES})
   INSTALL(TARGETS media-api
           LIBRARY DESTINATION ${plugin_install_dir})
 
diff --git a/plugins/media/export.map b/plugins/media/export.map
new file mode 100644
index 00000000..e2da85ca
--- /dev/null
+++ b/plugins/media/export.map
@@ -0,0 +1 @@
+{ global: pluginAfbV1Register; local: *; };
diff --git a/plugins/media/media-api.c b/plugins/media/media-api.c
index dace151f..6ba8d1e0 100644
--- a/plugins/media/media-api.c
+++ b/plugins/media/media-api.c
@@ -323,7 +323,7 @@ static const struct AFB_plugin pluginDesc = {
     }
 };
 
-const struct AFB_plugin *pluginAfbV1Entry (const struct AFB_interface *itf)
+const struct AFB_plugin *pluginAfbV1Register (const struct AFB_interface *itf)
 {
     return &pluginDesc;
 }
diff --git a/plugins/radio/CMakeLists.txt b/plugins/radio/CMakeLists.txt
index 04d0fa21..d86ca2b5 100644
--- a/plugins/radio/CMakeLists.txt
+++ b/plugins/radio/CMakeLists.txt
@@ -1,9 +1,16 @@
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(librtlsdr librtlsdr>=0.5.0)
+
 IF(librtlsdr_FOUND)
 
+  MESSAGE(STATUS "librtlsdr found ; will compile Radio plugin... (PLUGIN)")
+  INCLUDE_DIRECTORIES(${include_dirs} ${librtlsdr_INCLUDE_DIRS})
   ADD_LIBRARY(radio-api MODULE radio-api.c radio-rtlsdr.c)
-  SET_TARGET_PROPERTIES(radio-api PROPERTIES PREFIX "")
-  TARGET_LINK_LIBRARIES(radio-api ${link_libraries})
-  INCLUDE_DIRECTORIES(${include_dirs})
+  SET_TARGET_PROPERTIES(radio-api PROPERTIES
+	PREFIX ""
+	LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export.map"
+  )
+  TARGET_LINK_LIBRARIES(radio-api ${link_libraries} ${librtlsdr_LIBRARIES})
   INSTALL(TARGETS radio-api
           LIBRARY DESTINATION ${plugin_install_dir})
 
diff --git a/plugins/radio/export.map b/plugins/radio/export.map
new file mode 100644
index 00000000..e2da85ca
--- /dev/null
+++ b/plugins/radio/export.map
@@ -0,0 +1 @@
+{ global: pluginAfbV1Register; local: *; };
diff --git a/plugins/samples/CMakeLists.txt b/plugins/samples/CMakeLists.txt
index c3c305ca..271fb850 100644
--- a/plugins/samples/CMakeLists.txt
+++ b/plugins/samples/CMakeLists.txt
@@ -1,19 +1,29 @@
+
 INCLUDE_DIRECTORIES(${include_dirs})
 
 ADD_LIBRARY(helloWorld-api MODULE HelloWorld.c)
-SET_TARGET_PROPERTIES(helloWorld-api PROPERTIES PREFIX "")
+SET_TARGET_PROPERTIES(helloWorld-api PROPERTIES
+	PREFIX ""
+	LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export.map"
+)
 TARGET_LINK_LIBRARIES(helloWorld-api ${link_libraries})
 INSTALL(TARGETS helloWorld-api
         LIBRARY DESTINATION ${plugin_install_dir})
 
 ADD_LIBRARY(samplePost-api MODULE SamplePost.c)
-SET_TARGET_PROPERTIES(samplePost-api PROPERTIES PREFIX "")
+SET_TARGET_PROPERTIES(samplePost-api PROPERTIES
+	PREFIX ""
+	LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export.map"
+)
 TARGET_LINK_LIBRARIES(samplePost-api ${link_libraries})
 INSTALL(TARGETS samplePost-api
         LIBRARY DESTINATION ${plugin_install_dir})
 
 ADD_LIBRARY(clientCtx-api MODULE ClientCtx.c)
-SET_TARGET_PROPERTIES(clientCtx-api PROPERTIES PREFIX "")
+SET_TARGET_PROPERTIES(clientCtx-api PROPERTIES
+	PREFIX ""
+	LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export.map"
+)
 TARGET_LINK_LIBRARIES(clientCtx-api ${link_libraries})
 INSTALL(TARGETS clientCtx-api
         LIBRARY DESTINATION ${plugin_install_dir})
diff --git a/plugins/samples/export.map b/plugins/samples/export.map
new file mode 100644
index 00000000..e2da85ca
--- /dev/null
+++ b/plugins/samples/export.map
@@ -0,0 +1 @@
+{ global: pluginAfbV1Register; local: *; };
diff --git a/plugins/session/CMakeLists.txt b/plugins/session/CMakeLists.txt
index ab0596e6..e13a16b3 100644
--- a/plugins/session/CMakeLists.txt
+++ b/plugins/session/CMakeLists.txt
@@ -1,6 +1,9 @@
 
 ADD_LIBRARY(token-api MODULE token-api.c)
-SET_TARGET_PROPERTIES(token-api PROPERTIES PREFIX "")
+SET_TARGET_PROPERTIES(token-api PROPERTIES
+	PREFIX ""
+	LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export.map"
+)
 TARGET_LINK_LIBRARIES(token-api ${link_libraries})
 INCLUDE_DIRECTORIES(${include_dirs})
 INSTALL(TARGETS token-api
diff --git a/plugins/session/export.map b/plugins/session/export.map
new file mode 100644
index 00000000..e2da85ca
--- /dev/null
+++ b/plugins/session/export.map
@@ -0,0 +1 @@
+{ global: pluginAfbV1Register; local: *; };