From e211f82f6c963ab2f3d63fd398da2d2f95c22ba2 Mon Sep 17 00:00:00 2001 From: Abhishek Malik Date: Sat, 10 Sep 2016 13:20:01 -0700 Subject: [PATCH] Loudness: Adding C source to correct directory Signed-off-by: Abhishek Malik --- src/groveloudness/CMakeLists.txt | 7 ------- src/loudness/CMakeLists.txt | 14 +++++++++----- src/{groveloudness => loudness}/loudness.c | 0 src/{groveloudness => loudness}/loudness.h | 0 src/{groveloudness => loudness}/loudness_fti.c | 0 5 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 src/groveloudness/CMakeLists.txt rename src/{groveloudness => loudness}/loudness.c (100%) rename src/{groveloudness => loudness}/loudness.h (100%) rename src/{groveloudness => loudness}/loudness_fti.c (100%) diff --git a/src/groveloudness/CMakeLists.txt b/src/groveloudness/CMakeLists.txt deleted file mode 100644 index f3b0380f..00000000 --- a/src/groveloudness/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -upm_mixed_module_init (NAME loudness - DESCRIPTION "upm loudness sensor module" - C_HDR loudness.h - C_SRC loudness.c - CPP_SRC groveloudness.cxx - CPP_WRAPS_C - REQUIRES libmraa) diff --git a/src/loudness/CMakeLists.txt b/src/loudness/CMakeLists.txt index 41fffd7c..fa3259a9 100644 --- a/src/loudness/CMakeLists.txt +++ b/src/loudness/CMakeLists.txt @@ -1,5 +1,9 @@ -set (libname "loudness") -set (libdescription "upm loudness sensors") -set (module_src ${libname}.cxx) -set (module_hpp ${libname}.hpp) -upm_module_init() +upm_mixed_module_init (NAME loudness + DESCRIPTION "upm loudness sensor module" + C_HDR loudness.h + C_SRC loudness.c + CPP_SRC loudness.cxx + CPP_HDR loudness.hpp + FTI_SRC loudness_fti.c + CPP_WRAPS_C + REQUIRES libmraa) \ No newline at end of file diff --git a/src/groveloudness/loudness.c b/src/loudness/loudness.c similarity index 100% rename from src/groveloudness/loudness.c rename to src/loudness/loudness.c diff --git a/src/groveloudness/loudness.h b/src/loudness/loudness.h similarity index 100% rename from src/groveloudness/loudness.h rename to src/loudness/loudness.h diff --git a/src/groveloudness/loudness_fti.c b/src/loudness/loudness_fti.c similarity index 100% rename from src/groveloudness/loudness_fti.c rename to src/loudness/loudness_fti.c