Some much needed organization

2015-08-06 12:25:30 -04:00 · 2015-08-06 12:25:30 -04:00 · 6605925162
parent 6fbda52998
commit 6605925162
60 changed files with 7 additions and 6 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -11,13 +11,14 @@ find_package(LibMbe REQUIRED)
 find_package(ITPP REQUIRED)
 find_package(LibPortAudio)

-FILE(GLOB SRCS *.c *.cpp)
+FILE(GLOB SRCS src/*.c src/*.cpp)
+FILE(GLOB HEADERS include/*.h include/*.hpp)

-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/git_ver.c.in" "${CMAKE_CURRENT_BINARY_DIR}/git_ver.c" @ONLY)
-list(APPEND SRCS "${CMAKE_CURRENT_BINARY_DIR}/git_ver.c" git_ver.h)
+configure_file("src/git_ver.c.in" "${CMAKE_CURRENT_BINARY_DIR}/git_ver.c" @ONLY)
+list(APPEND SRCS "${CMAKE_CURRENT_BINARY_DIR}/git_ver.c")

 INCLUDE_DIRECTORIES(
-    "${PROJECT_SOURCE_DIR}"
+    "${PROJECT_SOURCE_DIR}/include"
    "${LIBSNDFILE_INCLUDE_DIR}"
    "${LIBMBE_INCLUDE_DIR}"
    "${ITPP_INCLUDE_DIR}"
@ -31,7 +32,7 @@ SET(LIBS ${LIBS} ${PORTAUDIO_LIBRARIES})
 add_definitions(-DUSE_PORTAUDIO)
 endif(PORTAUDIO_FOUND)

-ADD_EXECUTABLE(dsd ${SRCS})
+ADD_EXECUTABLE(dsd ${SRCS} ${HEADERS})
 TARGET_LINK_LIBRARIES(dsd ${LIBS})

 install(TARGETS dsd DESTINATION bin)
--- a/include/Golay24.hpp
+++ b/include/Golay24.hpp
--- a/include/Hamming.hpp
+++ b/include/Hamming.hpp
--- a/include/ReedSolomon.hpp
+++ b/include/ReedSolomon.hpp
--- a/include/config.h
+++ b/include/config.h
--- a/include/descramble.h
+++ b/include/descramble.h
--- a/include/dmr_const.h
+++ b/include/dmr_const.h
--- a/include/dsd.h
+++ b/include/dsd.h
--- a/include/dstar_const.h
+++ b/include/dstar_const.h
--- a/include/dstar_header.h
+++ b/include/dstar_header.h
--- a/include/fcs.h
+++ b/include/fcs.h
--- a/include/git_ver.h
+++ b/include/git_ver.h
--- a/include/nxdn96_const.h
+++ b/include/nxdn96_const.h
--- a/include/nxdn_const.h
+++ b/include/nxdn_const.h
--- a/include/p25p1_check_hdu.h
+++ b/include/p25p1_check_hdu.h
--- a/include/p25p1_check_ldu.h
+++ b/include/p25p1_check_ldu.h
--- a/include/p25p1_check_nid.h
+++ b/include/p25p1_check_nid.h
--- a/include/p25p1_const.h
+++ b/include/p25p1_const.h
--- a/include/p25p1_hdu.h
+++ b/include/p25p1_hdu.h
--- a/include/p25p1_heuristics.h
+++ b/include/p25p1_heuristics.h
--- a/include/p25p1_ldu.h
+++ b/include/p25p1_ldu.h
--- a/include/pa_devs.h
+++ b/include/pa_devs.h
--- a/include/provoice_const.h
+++ b/include/provoice_const.h
--- a/include/x2tdma_const.h
+++ b/include/x2tdma_const.h
--- a/src/Hamming.cpp
+++ b/src/Hamming.cpp
--- a/src/dmr_data.c
+++ b/src/dmr_data.c
--- a/src/dmr_voice.c
+++ b/src/dmr_voice.c
--- a/src/dsd_audio.c
+++ b/src/dsd_audio.c
--- a/src/dsd_dibit.c
+++ b/src/dsd_dibit.c
--- a/src/dsd_file.c
+++ b/src/dsd_file.c
--- a/src/dsd_filters.c
+++ b/src/dsd_filters.c
--- a/src/dsd_frame.c
+++ b/src/dsd_frame.c
--- a/src/dsd_frame_sync.c
+++ b/src/dsd_frame_sync.c
--- a/src/dsd_main.c
+++ b/src/dsd_main.c
--- a/src/dsd_mbe.c
+++ b/src/dsd_mbe.c
--- a/src/dsd_serial.c
+++ b/src/dsd_serial.c
--- a/src/dsd_symbol.c
+++ b/src/dsd_symbol.c
--- a/src/dsd_upsample.c
+++ b/src/dsd_upsample.c
--- a/src/dstar.c
+++ b/src/dstar.c
--- a/src/dstar_header.c
+++ b/src/dstar_header.c
--- a/src/git_ver.c.in
+++ b/src/git_ver.c.in
--- a/src/nxdn96.c
+++ b/src/nxdn96.c
--- a/src/nxdn_data.c
+++ b/src/nxdn_data.c
--- a/src/nxdn_voice.c
+++ b/src/nxdn_voice.c
--- a/src/p25_lcw.c
+++ b/src/p25_lcw.c
--- a/src/p25p1_check_hdu.cpp
+++ b/src/p25p1_check_hdu.cpp
--- a/src/p25p1_check_ldu.cpp
+++ b/src/p25p1_check_ldu.cpp
--- a/src/p25p1_check_nid.cpp
+++ b/src/p25p1_check_nid.cpp
--- a/src/p25p1_hdu.c
+++ b/src/p25p1_hdu.c
--- a/src/p25p1_heuristics.c
+++ b/src/p25p1_heuristics.c
--- a/src/p25p1_ldu.c
+++ b/src/p25p1_ldu.c
--- a/src/p25p1_ldu1.c
+++ b/src/p25p1_ldu1.c
--- a/src/p25p1_ldu2.c
+++ b/src/p25p1_ldu2.c
--- a/src/p25p1_tdu.c
+++ b/src/p25p1_tdu.c
--- a/src/p25p1_tdulc.c
+++ b/src/p25p1_tdulc.c
--- a/src/pa_devs.c
+++ b/src/pa_devs.c
--- a/src/provoice.c
+++ b/src/provoice.c
--- a/src/x2tdma_data.c
+++ b/src/x2tdma_data.c
--- a/src/x2tdma_voice.c
+++ b/src/x2tdma_voice.c
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@ -3,7 +3,7 @@ project(dsdtest)
 add_subdirectory(gtest)
 add_subdirectory(gmock)

-FILE(GLOB SRCS *.cpp ${dsdtest_SOURCE_DIR}/../Hamming.cpp)
+FILE(GLOB SRCS *.cpp ${dsdtest_SOURCE_DIR}/../src/Hamming.cpp)

 include_directories(
    ${PROJECT_SOURCE_DIR}/gtest/include