diff options
-rw-r--r-- | lib/4a-hal-utilities/4a-hal-utilities-alsa-data.c (renamed from 4a-hal-utilities/4a-hal-utilities-alsa-data.c) | 0 | ||||
-rw-r--r-- | lib/4a-hal-utilities/4a-hal-utilities-alsa-data.h (renamed from 4a-hal-utilities/4a-hal-utilities-alsa-data.h) | 0 | ||||
-rw-r--r-- | lib/4a-hal-utilities/4a-hal-utilities-data.c (renamed from 4a-hal-utilities/4a-hal-utilities-data.c) | 0 | ||||
-rw-r--r-- | lib/4a-hal-utilities/4a-hal-utilities-data.h (renamed from 4a-hal-utilities/4a-hal-utilities-data.h) | 0 | ||||
-rw-r--r-- | lib/4a-hal-utilities/4a-hal-utilities-hal-streams-handler.c (renamed from 4a-hal-utilities/4a-hal-utilities-hal-streams-handler.c) | 0 | ||||
-rw-r--r-- | lib/4a-hal-utilities/4a-hal-utilities-hal-streams-handler.h (renamed from 4a-hal-utilities/4a-hal-utilities-hal-streams-handler.h) | 0 | ||||
-rw-r--r-- | lib/4a-hal-utilities/4a-hal-utilities-verbs-loader.c (renamed from 4a-hal-utilities/4a-hal-utilities-verbs-loader.c) | 0 | ||||
-rw-r--r-- | lib/4a-hal-utilities/4a-hal-utilities-verbs-loader.h (renamed from 4a-hal-utilities/4a-hal-utilities-verbs-loader.h) | 0 | ||||
-rw-r--r-- | lib/4a-hal-utilities/CMakeLists.txt (renamed from 4a-hal-utilities/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | lib/CMakeLists.txt | 22 | ||||
-rw-r--r-- | plugins/lib/bluealsa/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/4a-hal-manager/4a-hal-manager-cb.c (renamed from 4a-hal/4a-hal-manager/4a-hal-manager-cb.c) | 0 | ||||
-rw-r--r-- | src/4a-hal-manager/4a-hal-manager-cb.h (renamed from 4a-hal/4a-hal-manager/4a-hal-manager-cb.h) | 0 | ||||
-rw-r--r-- | src/4a-hal-manager/4a-hal-manager.c (renamed from 4a-hal/4a-hal-manager/4a-hal-manager.c) | 0 | ||||
-rw-r--r-- | src/4a-hal-manager/4a-hal-manager.h (renamed from 4a-hal/4a-hal-manager/4a-hal-manager.h) | 0 | ||||
-rw-r--r-- | src/4a-internals-hal/4a-internals-hal-alsacore-link.c (renamed from 4a-hal/4a-internals-hal/4a-internals-hal-alsacore-link.c) | 0 | ||||
-rw-r--r-- | src/4a-internals-hal/4a-internals-hal-alsacore-link.h (renamed from 4a-hal/4a-internals-hal/4a-internals-hal-alsacore-link.h) | 0 | ||||
-rw-r--r-- | src/4a-internals-hal/4a-internals-hal-api-loader.c (renamed from 4a-hal/4a-internals-hal/4a-internals-hal-api-loader.c) | 0 | ||||
-rw-r--r-- | src/4a-internals-hal/4a-internals-hal-api-loader.h (renamed from 4a-hal/4a-internals-hal/4a-internals-hal-api-loader.h) | 0 | ||||
-rw-r--r-- | src/4a-internals-hal/4a-internals-hal-cb.c (renamed from 4a-hal/4a-internals-hal/4a-internals-hal-cb.c) | 0 | ||||
-rw-r--r-- | src/4a-internals-hal/4a-internals-hal-cb.h (renamed from 4a-hal/4a-internals-hal/4a-internals-hal-cb.h) | 0 | ||||
-rw-r--r-- | src/4a-internals-hal/4a-internals-hal-mixer-link.c (renamed from 4a-hal/4a-internals-hal/4a-internals-hal-mixer-link.c) | 0 | ||||
-rw-r--r-- | src/4a-internals-hal/4a-internals-hal-mixer-link.h (renamed from 4a-hal/4a-internals-hal/4a-internals-hal-mixer-link.h) | 0 | ||||
-rw-r--r-- | src/4a-internals-hal/4a-internals-hal-value-handler.c (renamed from 4a-hal/4a-internals-hal/4a-internals-hal-value-handler.c) | 0 | ||||
-rw-r--r-- | src/4a-internals-hal/4a-internals-hal-value-handler.h (renamed from 4a-hal/4a-internals-hal/4a-internals-hal-value-handler.h) | 0 | ||||
-rw-r--r-- | src/CMakeLists.txt (renamed from 4a-hal/CMakeLists.txt) | 0 |
26 files changed, 23 insertions, 1 deletions
diff --git a/4a-hal-utilities/4a-hal-utilities-alsa-data.c b/lib/4a-hal-utilities/4a-hal-utilities-alsa-data.c index 6409253..6409253 100644 --- a/4a-hal-utilities/4a-hal-utilities-alsa-data.c +++ b/lib/4a-hal-utilities/4a-hal-utilities-alsa-data.c diff --git a/4a-hal-utilities/4a-hal-utilities-alsa-data.h b/lib/4a-hal-utilities/4a-hal-utilities-alsa-data.h index fe70210..fe70210 100644 --- a/4a-hal-utilities/4a-hal-utilities-alsa-data.h +++ b/lib/4a-hal-utilities/4a-hal-utilities-alsa-data.h diff --git a/4a-hal-utilities/4a-hal-utilities-data.c b/lib/4a-hal-utilities/4a-hal-utilities-data.c index 314190f..314190f 100644 --- a/4a-hal-utilities/4a-hal-utilities-data.c +++ b/lib/4a-hal-utilities/4a-hal-utilities-data.c diff --git a/4a-hal-utilities/4a-hal-utilities-data.h b/lib/4a-hal-utilities/4a-hal-utilities-data.h index f3de1a6..f3de1a6 100644 --- a/4a-hal-utilities/4a-hal-utilities-data.h +++ b/lib/4a-hal-utilities/4a-hal-utilities-data.h diff --git a/4a-hal-utilities/4a-hal-utilities-hal-streams-handler.c b/lib/4a-hal-utilities/4a-hal-utilities-hal-streams-handler.c index ed06b27..ed06b27 100644 --- a/4a-hal-utilities/4a-hal-utilities-hal-streams-handler.c +++ b/lib/4a-hal-utilities/4a-hal-utilities-hal-streams-handler.c diff --git a/4a-hal-utilities/4a-hal-utilities-hal-streams-handler.h b/lib/4a-hal-utilities/4a-hal-utilities-hal-streams-handler.h index 028dd1f..028dd1f 100644 --- a/4a-hal-utilities/4a-hal-utilities-hal-streams-handler.h +++ b/lib/4a-hal-utilities/4a-hal-utilities-hal-streams-handler.h diff --git a/4a-hal-utilities/4a-hal-utilities-verbs-loader.c b/lib/4a-hal-utilities/4a-hal-utilities-verbs-loader.c index 16c28c4..16c28c4 100644 --- a/4a-hal-utilities/4a-hal-utilities-verbs-loader.c +++ b/lib/4a-hal-utilities/4a-hal-utilities-verbs-loader.c diff --git a/4a-hal-utilities/4a-hal-utilities-verbs-loader.h b/lib/4a-hal-utilities/4a-hal-utilities-verbs-loader.h index 9084595..9084595 100644 --- a/4a-hal-utilities/4a-hal-utilities-verbs-loader.h +++ b/lib/4a-hal-utilities/4a-hal-utilities-verbs-loader.h diff --git a/4a-hal-utilities/CMakeLists.txt b/lib/4a-hal-utilities/CMakeLists.txt index d90dd11..d90dd11 100644 --- a/4a-hal-utilities/CMakeLists.txt +++ b/lib/4a-hal-utilities/CMakeLists.txt diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt new file mode 100644 index 0000000..3fd93ec --- /dev/null +++ b/lib/CMakeLists.txt @@ -0,0 +1,22 @@ +########################################################################### +# Copyright 2015, 2016, 2017 IoT.bzh +# +# author: Fulup Ar Foll <fulup@iot.bzh> +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +########################################################################### + + +# Include any directory not starting with _ +# ----------------------------------------------------- +PROJECT_SUBDIRS_ADD() diff --git a/plugins/lib/bluealsa/CMakeLists.txt b/plugins/lib/bluealsa/CMakeLists.txt index e7d3216..697923a 100644 --- a/plugins/lib/bluealsa/CMakeLists.txt +++ b/plugins/lib/bluealsa/CMakeLists.txt @@ -45,5 +45,5 @@ PROJECT_TARGET_ADD(hal-bluealsa) target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_SOURCE_DIR}/app-controller/ctl-lib" - PRIVATE "${CMAKE_SOURCE_DIR}/4a-hal/4a-hal-utilities" + PRIVATE "${CMAKE_SOURCE_DIR}/lib/4a-hal-utilities" ) diff --git a/4a-hal/4a-hal-manager/4a-hal-manager-cb.c b/src/4a-hal-manager/4a-hal-manager-cb.c index 32fbb25..32fbb25 100644 --- a/4a-hal/4a-hal-manager/4a-hal-manager-cb.c +++ b/src/4a-hal-manager/4a-hal-manager-cb.c diff --git a/4a-hal/4a-hal-manager/4a-hal-manager-cb.h b/src/4a-hal-manager/4a-hal-manager-cb.h index e0e144f..e0e144f 100644 --- a/4a-hal/4a-hal-manager/4a-hal-manager-cb.h +++ b/src/4a-hal-manager/4a-hal-manager-cb.h diff --git a/4a-hal/4a-hal-manager/4a-hal-manager.c b/src/4a-hal-manager/4a-hal-manager.c index 4d2fbf1..4d2fbf1 100644 --- a/4a-hal/4a-hal-manager/4a-hal-manager.c +++ b/src/4a-hal-manager/4a-hal-manager.c diff --git a/4a-hal/4a-hal-manager/4a-hal-manager.h b/src/4a-hal-manager/4a-hal-manager.h index 4a53bdd..4a53bdd 100644 --- a/4a-hal/4a-hal-manager/4a-hal-manager.h +++ b/src/4a-hal-manager/4a-hal-manager.h diff --git a/4a-hal/4a-internals-hal/4a-internals-hal-alsacore-link.c b/src/4a-internals-hal/4a-internals-hal-alsacore-link.c index d092ddf..d092ddf 100644 --- a/4a-hal/4a-internals-hal/4a-internals-hal-alsacore-link.c +++ b/src/4a-internals-hal/4a-internals-hal-alsacore-link.c diff --git a/4a-hal/4a-internals-hal/4a-internals-hal-alsacore-link.h b/src/4a-internals-hal/4a-internals-hal-alsacore-link.h index 065e017..065e017 100644 --- a/4a-hal/4a-internals-hal/4a-internals-hal-alsacore-link.h +++ b/src/4a-internals-hal/4a-internals-hal-alsacore-link.h diff --git a/4a-hal/4a-internals-hal/4a-internals-hal-api-loader.c b/src/4a-internals-hal/4a-internals-hal-api-loader.c index 94891b8..94891b8 100644 --- a/4a-hal/4a-internals-hal/4a-internals-hal-api-loader.c +++ b/src/4a-internals-hal/4a-internals-hal-api-loader.c diff --git a/4a-hal/4a-internals-hal/4a-internals-hal-api-loader.h b/src/4a-internals-hal/4a-internals-hal-api-loader.h index fa878e2..fa878e2 100644 --- a/4a-hal/4a-internals-hal/4a-internals-hal-api-loader.h +++ b/src/4a-internals-hal/4a-internals-hal-api-loader.h diff --git a/4a-hal/4a-internals-hal/4a-internals-hal-cb.c b/src/4a-internals-hal/4a-internals-hal-cb.c index 0102d8d..0102d8d 100644 --- a/4a-hal/4a-internals-hal/4a-internals-hal-cb.c +++ b/src/4a-internals-hal/4a-internals-hal-cb.c diff --git a/4a-hal/4a-internals-hal/4a-internals-hal-cb.h b/src/4a-internals-hal/4a-internals-hal-cb.h index ff35656..ff35656 100644 --- a/4a-hal/4a-internals-hal/4a-internals-hal-cb.h +++ b/src/4a-internals-hal/4a-internals-hal-cb.h diff --git a/4a-hal/4a-internals-hal/4a-internals-hal-mixer-link.c b/src/4a-internals-hal/4a-internals-hal-mixer-link.c index 95e9099..95e9099 100644 --- a/4a-hal/4a-internals-hal/4a-internals-hal-mixer-link.c +++ b/src/4a-internals-hal/4a-internals-hal-mixer-link.c diff --git a/4a-hal/4a-internals-hal/4a-internals-hal-mixer-link.h b/src/4a-internals-hal/4a-internals-hal-mixer-link.h index 6c1f827..6c1f827 100644 --- a/4a-hal/4a-internals-hal/4a-internals-hal-mixer-link.h +++ b/src/4a-internals-hal/4a-internals-hal-mixer-link.h diff --git a/4a-hal/4a-internals-hal/4a-internals-hal-value-handler.c b/src/4a-internals-hal/4a-internals-hal-value-handler.c index 64083a9..64083a9 100644 --- a/4a-hal/4a-internals-hal/4a-internals-hal-value-handler.c +++ b/src/4a-internals-hal/4a-internals-hal-value-handler.c diff --git a/4a-hal/4a-internals-hal/4a-internals-hal-value-handler.h b/src/4a-internals-hal/4a-internals-hal-value-handler.h index f0288ac..f0288ac 100644 --- a/4a-hal/4a-internals-hal/4a-internals-hal-value-handler.h +++ b/src/4a-internals-hal/4a-internals-hal-value-handler.h diff --git a/4a-hal/CMakeLists.txt b/src/CMakeLists.txt index b863c5f..b863c5f 100644 --- a/4a-hal/CMakeLists.txt +++ b/src/CMakeLists.txt |