diff --git a/configure.ac b/configure.ac index 915db6a..e3b8d0e 100644 --- a/configure.ac +++ b/configure.ac @@ -78,17 +78,17 @@ AC_CHECK_LIB([m], [main]) AC_CHECK_LIB([pthread], [main]) AC_OUTPUT( - src/liboptions/Makefile - src/libdebug/Makefile - src/libsample/Makefile - src/libtimer/Makefile - src/libjitter/Makefile - src/libosmocc/Makefile - src/libg711/Makefile - src/libwave/Makefile - src/libdtmf/Makefile - src/libfm/Makefile - src/libfilter/Makefile + src/lib/liboptions/Makefile + src/lib/libdebug/Makefile + src/lib/libsample/Makefile + src/lib/libtimer/Makefile + src/lib/libjitter/Makefile + src/lib/libosmocc/Makefile + src/lib/libg711/Makefile + src/lib/libwave/Makefile + src/lib/libdtmf/Makefile + src/lib/libfm/Makefile + src/lib/libfilter/Makefile src/router/Makefile src/Makefile Makefile) diff --git a/src/Makefile.am b/src/Makefile.am index 4fc676a..f0bf1ef 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,16 +1,16 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = \ - liboptions \ - libdebug \ - libsample \ - libtimer \ - libjitter \ - libosmocc \ - libg711 \ - libwave \ - libdtmf \ - libfm \ - libfilter \ + lib/liboptions \ + lib/libdebug \ + lib/libsample \ + lib/libtimer \ + lib/libjitter \ + lib/libosmocc \ + lib/libg711 \ + lib/libwave \ + lib/libdtmf \ + lib/libfm \ + lib/libfilter \ router diff --git a/src/libdebug/Makefile.am b/src/lib/libdebug/Makefile.am similarity index 100% rename from src/libdebug/Makefile.am rename to src/lib/libdebug/Makefile.am diff --git a/src/libdebug/debug.c b/src/lib/libdebug/debug.c similarity index 100% rename from src/libdebug/debug.c rename to src/lib/libdebug/debug.c diff --git a/src/libdebug/debug.h b/src/lib/libdebug/debug.h similarity index 100% rename from src/libdebug/debug.h rename to src/lib/libdebug/debug.h diff --git a/src/libdtmf/Makefile.am b/src/lib/libdtmf/Makefile.am similarity index 100% rename from src/libdtmf/Makefile.am rename to src/lib/libdtmf/Makefile.am diff --git a/src/libdtmf/dtmf_decode.c b/src/lib/libdtmf/dtmf_decode.c similarity index 100% rename from src/libdtmf/dtmf_decode.c rename to src/lib/libdtmf/dtmf_decode.c diff --git a/src/libdtmf/dtmf_decode.h b/src/lib/libdtmf/dtmf_decode.h similarity index 100% rename from src/libdtmf/dtmf_decode.h rename to src/lib/libdtmf/dtmf_decode.h diff --git a/src/libdtmf/dtmf_encode.c b/src/lib/libdtmf/dtmf_encode.c similarity index 100% rename from src/libdtmf/dtmf_encode.c rename to src/lib/libdtmf/dtmf_encode.c diff --git a/src/libdtmf/dtmf_encode.h b/src/lib/libdtmf/dtmf_encode.h similarity index 100% rename from src/libdtmf/dtmf_encode.h rename to src/lib/libdtmf/dtmf_encode.h diff --git a/src/libfilter/Makefile.am b/src/lib/libfilter/Makefile.am similarity index 100% rename from src/libfilter/Makefile.am rename to src/lib/libfilter/Makefile.am diff --git a/src/libfilter/fir_filter.c b/src/lib/libfilter/fir_filter.c similarity index 100% rename from src/libfilter/fir_filter.c rename to src/lib/libfilter/fir_filter.c diff --git a/src/libfilter/fir_filter.h b/src/lib/libfilter/fir_filter.h similarity index 100% rename from src/libfilter/fir_filter.h rename to src/lib/libfilter/fir_filter.h diff --git a/src/libfilter/iir_filter.c b/src/lib/libfilter/iir_filter.c similarity index 100% rename from src/libfilter/iir_filter.c rename to src/lib/libfilter/iir_filter.c diff --git a/src/libfilter/iir_filter.h b/src/lib/libfilter/iir_filter.h similarity index 100% rename from src/libfilter/iir_filter.h rename to src/lib/libfilter/iir_filter.h diff --git a/src/libfm/Makefile.am b/src/lib/libfm/Makefile.am similarity index 100% rename from src/libfm/Makefile.am rename to src/lib/libfm/Makefile.am diff --git a/src/libfm/fm.c b/src/lib/libfm/fm.c similarity index 100% rename from src/libfm/fm.c rename to src/lib/libfm/fm.c diff --git a/src/libfm/fm.h b/src/lib/libfm/fm.h similarity index 100% rename from src/libfm/fm.h rename to src/lib/libfm/fm.h diff --git a/src/libg711/Makefile.am b/src/lib/libg711/Makefile.am similarity index 100% rename from src/libg711/Makefile.am rename to src/lib/libg711/Makefile.am diff --git a/src/libg711/g711.c b/src/lib/libg711/g711.c similarity index 100% rename from src/libg711/g711.c rename to src/lib/libg711/g711.c diff --git a/src/libg711/g711.h b/src/lib/libg711/g711.h similarity index 100% rename from src/libg711/g711.h rename to src/lib/libg711/g711.h diff --git a/src/libjitter/Makefile.am b/src/lib/libjitter/Makefile.am similarity index 100% rename from src/libjitter/Makefile.am rename to src/lib/libjitter/Makefile.am diff --git a/src/libjitter/jitter.c b/src/lib/libjitter/jitter.c similarity index 100% rename from src/libjitter/jitter.c rename to src/lib/libjitter/jitter.c diff --git a/src/libjitter/jitter.h b/src/lib/libjitter/jitter.h similarity index 100% rename from src/libjitter/jitter.h rename to src/lib/libjitter/jitter.h diff --git a/src/liboptions/Makefile.am b/src/lib/liboptions/Makefile.am similarity index 100% rename from src/liboptions/Makefile.am rename to src/lib/liboptions/Makefile.am diff --git a/src/liboptions/options.c b/src/lib/liboptions/options.c similarity index 100% rename from src/liboptions/options.c rename to src/lib/liboptions/options.c diff --git a/src/liboptions/options.h b/src/lib/liboptions/options.h similarity index 100% rename from src/liboptions/options.h rename to src/lib/liboptions/options.h diff --git a/src/libosmocc/Makefile.am b/src/lib/libosmocc/Makefile.am similarity index 100% rename from src/libosmocc/Makefile.am rename to src/lib/libosmocc/Makefile.am diff --git a/src/libosmocc/cause.c b/src/lib/libosmocc/cause.c similarity index 100% rename from src/libosmocc/cause.c rename to src/lib/libosmocc/cause.c diff --git a/src/libosmocc/cause.h b/src/lib/libosmocc/cause.h similarity index 100% rename from src/libosmocc/cause.h rename to src/lib/libosmocc/cause.h diff --git a/src/libosmocc/endpoint.c b/src/lib/libosmocc/endpoint.c similarity index 100% rename from src/libosmocc/endpoint.c rename to src/lib/libosmocc/endpoint.c diff --git a/src/libosmocc/endpoint.h b/src/lib/libosmocc/endpoint.h similarity index 100% rename from src/libosmocc/endpoint.h rename to src/lib/libosmocc/endpoint.h diff --git a/src/libosmocc/helper.c b/src/lib/libosmocc/helper.c similarity index 100% rename from src/libosmocc/helper.c rename to src/lib/libosmocc/helper.c diff --git a/src/libosmocc/helper.h b/src/lib/libosmocc/helper.h similarity index 100% rename from src/libosmocc/helper.h rename to src/lib/libosmocc/helper.h diff --git a/src/libosmocc/message.c b/src/lib/libosmocc/message.c similarity index 100% rename from src/libosmocc/message.c rename to src/lib/libosmocc/message.c diff --git a/src/libosmocc/message.h b/src/lib/libosmocc/message.h similarity index 100% rename from src/libosmocc/message.h rename to src/lib/libosmocc/message.h diff --git a/src/libosmocc/rtp.c b/src/lib/libosmocc/rtp.c similarity index 100% rename from src/libosmocc/rtp.c rename to src/lib/libosmocc/rtp.c diff --git a/src/libosmocc/rtp.h b/src/lib/libosmocc/rtp.h similarity index 100% rename from src/libosmocc/rtp.h rename to src/lib/libosmocc/rtp.h diff --git a/src/libosmocc/screen.c b/src/lib/libosmocc/screen.c similarity index 100% rename from src/libosmocc/screen.c rename to src/lib/libosmocc/screen.c diff --git a/src/libosmocc/screen.h b/src/lib/libosmocc/screen.h similarity index 100% rename from src/libosmocc/screen.h rename to src/lib/libosmocc/screen.h diff --git a/src/libosmocc/sdp.c b/src/lib/libosmocc/sdp.c similarity index 100% rename from src/libosmocc/sdp.c rename to src/lib/libosmocc/sdp.c diff --git a/src/libosmocc/sdp.h b/src/lib/libosmocc/sdp.h similarity index 100% rename from src/libosmocc/sdp.h rename to src/lib/libosmocc/sdp.h diff --git a/src/libosmocc/session.c b/src/lib/libosmocc/session.c similarity index 100% rename from src/libosmocc/session.c rename to src/lib/libosmocc/session.c diff --git a/src/libosmocc/session.h b/src/lib/libosmocc/session.h similarity index 100% rename from src/libosmocc/session.h rename to src/lib/libosmocc/session.h diff --git a/src/libosmocc/socket.c b/src/lib/libosmocc/socket.c similarity index 100% rename from src/libosmocc/socket.c rename to src/lib/libosmocc/socket.c diff --git a/src/libosmocc/socket.h b/src/lib/libosmocc/socket.h similarity index 100% rename from src/libosmocc/socket.h rename to src/lib/libosmocc/socket.h diff --git a/src/libsample/Makefile.am b/src/lib/libsample/Makefile.am similarity index 100% rename from src/libsample/Makefile.am rename to src/lib/libsample/Makefile.am diff --git a/src/libsample/sample.c b/src/lib/libsample/sample.c similarity index 100% rename from src/libsample/sample.c rename to src/lib/libsample/sample.c diff --git a/src/libsample/sample.h b/src/lib/libsample/sample.h similarity index 100% rename from src/libsample/sample.h rename to src/lib/libsample/sample.h diff --git a/src/libtimer/Makefile.am b/src/lib/libtimer/Makefile.am similarity index 100% rename from src/libtimer/Makefile.am rename to src/lib/libtimer/Makefile.am diff --git a/src/libtimer/timer.c b/src/lib/libtimer/timer.c similarity index 100% rename from src/libtimer/timer.c rename to src/lib/libtimer/timer.c diff --git a/src/libtimer/timer.h b/src/lib/libtimer/timer.h similarity index 100% rename from src/libtimer/timer.h rename to src/lib/libtimer/timer.h diff --git a/src/libwave/Makefile.am b/src/lib/libwave/Makefile.am similarity index 100% rename from src/libwave/Makefile.am rename to src/lib/libwave/Makefile.am diff --git a/src/libwave/wave.c b/src/lib/libwave/wave.c similarity index 100% rename from src/libwave/wave.c rename to src/lib/libwave/wave.c diff --git a/src/libwave/wave.h b/src/lib/libwave/wave.h similarity index 100% rename from src/libwave/wave.h rename to src/lib/libwave/wave.h diff --git a/src/router/Makefile.am b/src/router/Makefile.am index e7d9384..a1c5fa7 100644 --- a/src/router/Makefile.am +++ b/src/router/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) +AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) -I../lib bin_PROGRAMS = \ osmo-cc-router @@ -12,15 +12,15 @@ osmo_cc_router_SOURCES = \ osmo_cc_router_LDADD = \ $(COMMON_LA) \ - ../libdebug/libdebug.a \ - ../liboptions/liboptions.a \ - ../libsample/libsample.a \ - ../libtimer/libtimer.a \ - ../libjitter/libjitter.a \ - ../libosmocc/libosmocc.a \ - ../libg711/libg711.a \ - ../libdtmf/libdtmf.a \ - ../libfm/libfm.a \ - ../libfilter/libfilter.a \ - ../libwave/libwave.a + ../lib/libdebug/libdebug.a \ + ../lib/liboptions/liboptions.a \ + ../lib/libsample/libsample.a \ + ../lib/libtimer/libtimer.a \ + ../lib/libjitter/libjitter.a \ + ../lib/libosmocc/libosmocc.a \ + ../lib/libg711/libg711.a \ + ../lib/libdtmf/libdtmf.a \ + ../lib/libfm/libfm.a \ + ../lib/libfilter/libfilter.a \ + ../lib/libwave/libwave.a diff --git a/src/router/audio.c b/src/router/audio.c index 16e83c0..a3aa752 100644 --- a/src/router/audio.c +++ b/src/router/audio.c @@ -95,7 +95,7 @@ #include #include #include -#include "../libdebug/debug.h" +#include #include "call.h" #include "audio.h" diff --git a/src/router/call.c b/src/router/call.c index e74ae60..448bf6a 100644 --- a/src/router/call.c +++ b/src/router/call.c @@ -70,8 +70,8 @@ #include #include #include -#include "../libdebug/debug.h" -#include "../libg711/g711.h" +#include +#include #include "call.h" #include "audio.h" #include "display.h" diff --git a/src/router/call.h b/src/router/call.h index ac672ac..d2ff0a0 100644 --- a/src/router/call.h +++ b/src/router/call.h @@ -1,11 +1,11 @@ -#include "../libtimer/timer.h" -#include "../libosmocc/endpoint.h" -#include "../libosmocc/helper.h" -#include "../libsample/sample.h" -#include "../libjitter/jitter.h" -#include "../libwave/wave.h" -#include "../libdtmf/dtmf_decode.h" +#include +#include +#include +#include +#include +#include +#include enum call_state { diff --git a/src/router/display_status.c b/src/router/display_status.c index 7f3723f..3f93a61 100644 --- a/src/router/display_status.c +++ b/src/router/display_status.c @@ -21,7 +21,7 @@ #include #include #include -#include "../libdebug/debug.h" +#include #include "call.h" #include "display.h" diff --git a/src/router/main.c b/src/router/main.c index eaf2d95..7751ab8 100644 --- a/src/router/main.c +++ b/src/router/main.c @@ -25,9 +25,9 @@ #include #include #include -#include "../libdebug/debug.h" -#include "../liboptions/options.h" -#include "../libg711/g711.h" +#include +#include +#include #include "call.h" #include "audio.h" #include "display.h" diff --git a/src/router/routing.c b/src/router/routing.c index 8d5485c..256ed28 100644 --- a/src/router/routing.c +++ b/src/router/routing.c @@ -29,7 +29,7 @@ #include #include #include -#include "../libdebug/debug.h" +#include #include "call.h" extern char **environ;