Some much needed organization

szechyjs · Aug 6, 2015 · 6605925 · 6605925
1 parent 6fbda52
commit 6605925
Show file tree

Hide file tree

Showing 60 changed files with 7 additions and 6 deletions.
diff --git 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)

diff --git a/Golay24.hpp → include/Golay24.hpp b/Golay24.hpp → include/Golay24.hpp
diff --git a/Hamming.hpp → include/Hamming.hpp b/Hamming.hpp → include/Hamming.hpp
diff --git a/ReedSolomon.hpp → include/ReedSolomon.hpp b/ReedSolomon.hpp → include/ReedSolomon.hpp
diff --git a/config.h → include/config.h b/config.h → include/config.h
diff --git a/descramble.h → include/descramble.h b/descramble.h → include/descramble.h
diff --git a/dmr_const.h → include/dmr_const.h b/dmr_const.h → include/dmr_const.h
diff --git a/dsd.h → include/dsd.h b/dsd.h → include/dsd.h
diff --git a/dstar_const.h → include/dstar_const.h b/dstar_const.h → include/dstar_const.h
diff --git a/dstar_header.h → include/dstar_header.h b/dstar_header.h → include/dstar_header.h
diff --git a/fcs.h → include/fcs.h b/fcs.h → include/fcs.h
diff --git a/git_ver.h → include/git_ver.h b/git_ver.h → include/git_ver.h
diff --git a/nxdn96_const.h → include/nxdn96_const.h b/nxdn96_const.h → include/nxdn96_const.h
diff --git a/nxdn_const.h → include/nxdn_const.h b/nxdn_const.h → include/nxdn_const.h
diff --git a/p25p1_check_hdu.h → include/p25p1_check_hdu.h b/p25p1_check_hdu.h → include/p25p1_check_hdu.h
diff --git a/p25p1_check_ldu.h → include/p25p1_check_ldu.h b/p25p1_check_ldu.h → include/p25p1_check_ldu.h
diff --git a/p25p1_check_nid.h → include/p25p1_check_nid.h b/p25p1_check_nid.h → include/p25p1_check_nid.h
diff --git a/p25p1_const.h → include/p25p1_const.h b/p25p1_const.h → include/p25p1_const.h
diff --git a/p25p1_hdu.h → include/p25p1_hdu.h b/p25p1_hdu.h → include/p25p1_hdu.h
diff --git a/p25p1_heuristics.h → include/p25p1_heuristics.h b/p25p1_heuristics.h → include/p25p1_heuristics.h
diff --git a/p25p1_ldu.h → include/p25p1_ldu.h b/p25p1_ldu.h → include/p25p1_ldu.h
diff --git a/pa_devs.h → include/pa_devs.h b/pa_devs.h → include/pa_devs.h
diff --git a/provoice_const.h → include/provoice_const.h b/provoice_const.h → include/provoice_const.h
diff --git a/x2tdma_const.h → include/x2tdma_const.h b/x2tdma_const.h → include/x2tdma_const.h
diff --git a/Hamming.cpp → src/Hamming.cpp b/Hamming.cpp → src/Hamming.cpp
diff --git a/dmr_data.c → src/dmr_data.c b/dmr_data.c → src/dmr_data.c
diff --git a/dmr_voice.c → src/dmr_voice.c b/dmr_voice.c → src/dmr_voice.c
diff --git a/dsd_audio.c → src/dsd_audio.c b/dsd_audio.c → src/dsd_audio.c
diff --git a/dsd_dibit.c → src/dsd_dibit.c b/dsd_dibit.c → src/dsd_dibit.c
diff --git a/dsd_file.c → src/dsd_file.c b/dsd_file.c → src/dsd_file.c
diff --git a/dsd_filters.c → src/dsd_filters.c b/dsd_filters.c → src/dsd_filters.c
diff --git a/dsd_frame.c → src/dsd_frame.c b/dsd_frame.c → src/dsd_frame.c
diff --git a/dsd_frame_sync.c → src/dsd_frame_sync.c b/dsd_frame_sync.c → src/dsd_frame_sync.c
diff --git a/dsd_main.c → src/dsd_main.c b/dsd_main.c → src/dsd_main.c
diff --git a/dsd_mbe.c → src/dsd_mbe.c b/dsd_mbe.c → src/dsd_mbe.c
diff --git a/dsd_serial.c → src/dsd_serial.c b/dsd_serial.c → src/dsd_serial.c
diff --git a/dsd_symbol.c → src/dsd_symbol.c b/dsd_symbol.c → src/dsd_symbol.c
diff --git a/dsd_upsample.c → src/dsd_upsample.c b/dsd_upsample.c → src/dsd_upsample.c
diff --git a/dstar.c → src/dstar.c b/dstar.c → src/dstar.c
diff --git a/dstar_header.c → src/dstar_header.c b/dstar_header.c → src/dstar_header.c
diff --git a/git_ver.c.in → src/git_ver.c.in b/git_ver.c.in → src/git_ver.c.in
diff --git a/nxdn96.c → src/nxdn96.c b/nxdn96.c → src/nxdn96.c
diff --git a/nxdn_data.c → src/nxdn_data.c b/nxdn_data.c → src/nxdn_data.c
diff --git a/nxdn_voice.c → src/nxdn_voice.c b/nxdn_voice.c → src/nxdn_voice.c
diff --git a/p25_lcw.c → src/p25_lcw.c b/p25_lcw.c → src/p25_lcw.c
diff --git a/p25p1_check_hdu.cpp → src/p25p1_check_hdu.cpp b/p25p1_check_hdu.cpp → src/p25p1_check_hdu.cpp
diff --git a/p25p1_check_ldu.cpp → src/p25p1_check_ldu.cpp b/p25p1_check_ldu.cpp → src/p25p1_check_ldu.cpp
diff --git a/p25p1_check_nid.cpp → src/p25p1_check_nid.cpp b/p25p1_check_nid.cpp → src/p25p1_check_nid.cpp
diff --git a/p25p1_hdu.c → src/p25p1_hdu.c b/p25p1_hdu.c → src/p25p1_hdu.c
diff --git a/p25p1_heuristics.c → src/p25p1_heuristics.c b/p25p1_heuristics.c → src/p25p1_heuristics.c
diff --git a/p25p1_ldu.c → src/p25p1_ldu.c b/p25p1_ldu.c → src/p25p1_ldu.c
diff --git a/p25p1_ldu1.c → src/p25p1_ldu1.c b/p25p1_ldu1.c → src/p25p1_ldu1.c
diff --git a/p25p1_ldu2.c → src/p25p1_ldu2.c b/p25p1_ldu2.c → src/p25p1_ldu2.c
diff --git a/p25p1_tdu.c → src/p25p1_tdu.c b/p25p1_tdu.c → src/p25p1_tdu.c
diff --git a/p25p1_tdulc.c → src/p25p1_tdulc.c b/p25p1_tdulc.c → src/p25p1_tdulc.c
diff --git a/pa_devs.c → src/pa_devs.c b/pa_devs.c → src/pa_devs.c
diff --git a/provoice.c → src/provoice.c b/provoice.c → src/provoice.c
diff --git a/x2tdma_data.c → src/x2tdma_data.c b/x2tdma_data.c → src/x2tdma_data.c
diff --git a/x2tdma_voice.c → src/x2tdma_voice.c b/x2tdma_voice.c → src/x2tdma_voice.c
diff --git 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