aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfulup <fulup.arfoll@iot.bzh>2017-04-09 20:27:01 +0200
committerfulup <fulup.arfoll@iot.bzh>2017-04-09 20:27:01 +0200
commitea5beb82ccad84fe465c8b28794fab2a2b1cd6d4 (patch)
tree2f4d5b80b33861ddca5464b2e80198a977b3f358
parent110ce18498753385fb880704490c9d86807a471f (diff)
Cleanup and File renaming
-rw-r--r--ALSA-afb/Alsa-ApiHat.c (renamed from ALSA-afb/AlsaCoreBinding.c)2
-rw-r--r--ALSA-afb/Alsa-ApiHat.h (renamed from ALSA-afb/AlsaCoreBinding.h)0
-rw-r--r--ALSA-afb/Alsa-SetGet.c (renamed from ALSA-afb/AlsaCtlSetGet.c)3
-rw-r--r--ALSA-afb/Alsa-Ucm.c (renamed from ALSA-afb/AlsaUseCase.c)3
-rw-r--r--ALSA-afb/CMakeLists.txt4
-rw-r--r--CMakeLists.txt10
-rw-r--r--HAL-afb/HDA-intel/CMakeLists.txt2
-rw-r--r--HighLevel-afb/CMakeLists.txt2
-rw-r--r--Shared-Interface/CMakeLists.txt (renamed from Audio-Interface/CMakeLists.txt)0
-rw-r--r--Shared-Interface/audio-interface.c (renamed from Audio-Interface/audio-interface.c)0
-rw-r--r--Shared-Interface/audio-interface.h (renamed from Audio-Interface/audio-interface.h)0
-rw-r--r--etc/config.cmake25
-rw-r--r--etc/export.map (renamed from export.map)0
13 files changed, 33 insertions, 18 deletions
diff --git a/ALSA-afb/AlsaCoreBinding.c b/ALSA-afb/Alsa-ApiHat.c
index d866daf..261b54d 100644
--- a/ALSA-afb/AlsaCoreBinding.c
+++ b/ALSA-afb/Alsa-ApiHat.c
@@ -26,7 +26,7 @@
#include <sys/time.h>
#include <sys/types.h>
-#include "AlsaCoreBinding.h"
+#include "Alsa-ApiHat.h"
PUBLIC const struct afb_binding_interface *afbIface;
diff --git a/ALSA-afb/AlsaCoreBinding.h b/ALSA-afb/Alsa-ApiHat.h
index c0fd51f..c0fd51f 100644
--- a/ALSA-afb/AlsaCoreBinding.h
+++ b/ALSA-afb/Alsa-ApiHat.h
diff --git a/ALSA-afb/AlsaCtlSetGet.c b/ALSA-afb/Alsa-SetGet.c
index a41e390..1f80d01 100644
--- a/ALSA-afb/AlsaCtlSetGet.c
+++ b/ALSA-afb/Alsa-SetGet.c
@@ -27,10 +27,9 @@
#define _GNU_SOURCE // needed for vasprintf
#include <alsa/asoundlib.h>
-#include "AlsaCoreBinding.h"
#include <systemd/sd-event.h>
-
+#include "Alsa-ApiHat.h"
// use to store crl numid user request
typedef struct {
diff --git a/ALSA-afb/AlsaUseCase.c b/ALSA-afb/Alsa-Ucm.c
index 8e23e3c..78a80ad 100644
--- a/ALSA-afb/AlsaUseCase.c
+++ b/ALSA-afb/Alsa-Ucm.c
@@ -36,10 +36,11 @@
#define _GNU_SOURCE // needed for vasprintf
#include <alsa/asoundlib.h>
-#include "AlsaCoreBinding.h"
#include <alsa/asoundlib.h>
#include <alsa/use-case.h>
+#include "Alsa-ApiHat.h"
+
typedef struct {
snd_use_case_mgr_t *ucm;
int cardId;
diff --git a/ALSA-afb/CMakeLists.txt b/ALSA-afb/CMakeLists.txt
index d36dd78..f18449a 100644
--- a/ALSA-afb/CMakeLists.txt
+++ b/ALSA-afb/CMakeLists.txt
@@ -20,12 +20,12 @@
PROJECT_TARGET_ADD(alsa-afb)
# Define project Targets
- ADD_LIBRARY(alsa-afb MODULE AlsaCoreBinding.c AlsaCtlSetGet.c AlsaUseCase.c)
+ ADD_LIBRARY(alsa-afb MODULE Alsa-ApiHat.c Alsa-SetGet.c Alsa-Ucm.c)
# Binder exposes a unique public entry point
SET_TARGET_PROPERTIES(alsa-afb PROPERTIES
PREFIX ""
- LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/export.map"
+ LINK_FLAGS ${BINDINGS_LINK_FLAG}
OUTPUT_NAME alsa-lowlevel-binding
)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9f63db..fc9129c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,11 +118,17 @@ ENDIF(CMAKE_BUILD_TYPE MATCHES DEBUG)
INCLUDE_DIRECTORIES(${EXTRA_INCLUDE_DIRS})
# If no install dir try to guest some smart default
-if(NOT BINDINGS_INSTALL_DIR)
- message (status "*** ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME}")
+if(BINDINGS_INSTALL_PREFIX)
+ set(BINDINGS_INSTALL_DIR ${BINDINGS_INSTALL_PREFIX}/${PROJECT_NAME})
+else()
set(BINDINGS_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME})
endif()
+# Default Linkflag
+if(NOT BINDINGS_LINK_FLAG)
+ set(BINDINGS_LINK_FLAG "-Wl,--version-script=${CMAKE_SOURCE_DIR}/etc/export.map")
+endif()
+
# Bindings to compile
# --------------------
file(GLOB filelist "[A-z]*")
diff --git a/HAL-afb/HDA-intel/CMakeLists.txt b/HAL-afb/HDA-intel/CMakeLists.txt
index 57400b5..0d32368 100644
--- a/HAL-afb/HDA-intel/CMakeLists.txt
+++ b/HAL-afb/HDA-intel/CMakeLists.txt
@@ -26,7 +26,7 @@ PROJECT_TARGET_ADD(hal-intel-hda)
# Binder exposes a unique public entry point
SET_TARGET_PROPERTIES(hal-intel-hda PROPERTIES
PREFIX ""
- LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/export.map"
+ LINK_FLAGS ${BINDINGS_LINK_FLAG}
OUTPUT_NAME intel-hda-binding
)
diff --git a/HighLevel-afb/CMakeLists.txt b/HighLevel-afb/CMakeLists.txt
index 6fe0929..52a025f 100644
--- a/HighLevel-afb/CMakeLists.txt
+++ b/HighLevel-afb/CMakeLists.txt
@@ -25,7 +25,7 @@ PROJECT_TARGET_ADD(audio-afb)
# Binder exposes a unique public entry point
SET_TARGET_PROPERTIES(audio-afb PROPERTIES
PREFIX ""
- LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/export.map"
+ LINK_FLAGS ${BINDINGS_LINK_FLAG}
OUTPUT_NAME audio-highlevel-binding
)
diff --git a/Audio-Interface/CMakeLists.txt b/Shared-Interface/CMakeLists.txt
index 665007f..665007f 100644
--- a/Audio-Interface/CMakeLists.txt
+++ b/Shared-Interface/CMakeLists.txt
diff --git a/Audio-Interface/audio-interface.c b/Shared-Interface/audio-interface.c
index c1c4054..c1c4054 100644
--- a/Audio-Interface/audio-interface.c
+++ b/Shared-Interface/audio-interface.c
diff --git a/Audio-Interface/audio-interface.h b/Shared-Interface/audio-interface.h
index ffefbfc..ffefbfc 100644
--- a/Audio-Interface/audio-interface.h
+++ b/Shared-Interface/audio-interface.h
diff --git a/etc/config.cmake b/etc/config.cmake
index ae27a86..57e379c 100644
--- a/etc/config.cmake
+++ b/etc/config.cmake
@@ -39,11 +39,20 @@
# Static constante definition
# -----------------------------
add_compile_options(-DMAX_SND_CARD=16)
- add_compile_options(-DCONTROL_CDEV_RX="/dev/inic-usb-crx")
+
+# Print a helper message when every thing is finished
+# ----------------------------------------------------
+ setc(CLOSING_MESSAGE "Test with: afb-daemon --ldpaths=. --port=1234 --roothttp=../htdocs --tracereq=common --token="" --verbose")
+
+# (BUG!!!) as PKG_CONFIG_PATH does not work [should be en env variable]
+# ---------------------------------------------------------------------
+ setc(CMAKE_INSTALL_PREFIX ${HOME}/opt)
+ setc(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+ setc(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib)
# Optional dependencies order
# ---------------------------
- #set(EXTRA_DEPENDENCY_ORDER target1 target2 ...)
+ #set(EXTRA_DEPENDENCIES_ORDER target1 target2 ...)
# Optional Extra global include path
# ------------------------------------
@@ -53,12 +62,12 @@
# -------------------------
# set(EXTRA_LINK_LIBRARIES lib1 lib2 ... )
-# Install default destination
-# --------------------------------
- # set(BINDINGS_INSTALL_DIR DestinationPath )
+# Optional force binding installation
+# ------------------------------------
+ # set(BINDINGS_INSTALL_PREFIX DestinationPath )
-# Print a helper message when every thing is finished
-# ----------------------------------------------------
- setc(CLOSING_MESSAGE "Test with: afb-daemon --ldpaths=. --port=1234 --roothttp=../htdocs --tracereq=common --token="" --verbose")
+# Optional force binding Linking flag
+# ------------------------------------
+ # set(BINDINGS_LINK_FLAG LinkOptions )
diff --git a/export.map b/etc/export.map
index 52c1b4a..52c1b4a 100644
--- a/export.map
+++ b/etc/export.map