diff --git a/configure.ac b/configure.ac index ffab45c..cc0c839 100644 --- a/configure.ac +++ b/configure.ac @@ -80,13 +80,13 @@ 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/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/isdn/Makefile src/Makefile Makefile) diff --git a/src/Makefile.am b/src/Makefile.am index c2cd6e4..b879656 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,12 +1,12 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = \ - liboptions \ - libdebug \ - libsample \ - libtimer \ - libjitter \ - libosmocc \ - libg711 \ + lib/liboptions \ + lib/libdebug \ + lib/libsample \ + lib/libtimer \ + lib/libjitter \ + lib/libosmocc \ + lib/libg711 \ isdn diff --git a/src/isdn/Makefile.am b/src/isdn/Makefile.am index d319da0..78fc21a 100644 --- a/src/isdn/Makefile.am +++ b/src/isdn/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-misdn-endpoint @@ -11,12 +11,12 @@ osmo_cc_misdn_endpoint_SOURCES = \ osmo_cc_misdn_endpoint_LDADD = \ $(COMMON_LA) \ - ../libdebug/libdebug.a \ - ../liboptions/liboptions.a \ - ../libsample/libsample.a \ - ../libtimer/libtimer.a \ - ../libjitter/libjitter.a \ - ../libosmocc/libosmocc.a \ - ../libg711/libg711.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 \ -lmisdn diff --git a/src/isdn/dss1.c b/src/isdn/dss1.c index 474febe..01da0b5 100644 --- a/src/isdn/dss1.c +++ b/src/isdn/dss1.c @@ -25,8 +25,8 @@ #include #include #include -#include "../libdebug/debug.h" -#include "../libg711/g711.h" +#include +#include #include "isdn.h" #include "dss1.h" #include "ie.h" diff --git a/src/isdn/ie.c b/src/isdn/ie.c index a79571c..20c2279 100644 --- a/src/isdn/ie.c +++ b/src/isdn/ie.c @@ -13,7 +13,7 @@ #include #include #include -#include "../libdebug/debug.h" +#include #ifndef u_char #define u_char unsigned char #endif diff --git a/src/isdn/isdn.c b/src/isdn/isdn.c index 04d2d13..165b882 100644 --- a/src/isdn/isdn.c +++ b/src/isdn/isdn.c @@ -27,8 +27,8 @@ #include #include #include -#include "../libdebug/debug.h" -#include "../libg711/g711.h" +#include +#include #include "isdn.h" #include "dss1.h" #include "ie.h" diff --git a/src/isdn/isdn.h b/src/isdn/isdn.h index 8abc49d..bb2e928 100644 --- a/src/isdn/isdn.h +++ b/src/isdn/isdn.h @@ -1,10 +1,10 @@ #include -#include "../libtimer/timer.h" -#include "../libosmocc/endpoint.h" -#include "../libosmocc/helper.h" -#include "../libsample/sample.h" -#include "../libjitter/jitter.h" +#include +#include +#include +#include +#include #define B_MODE_TRANSPARENT 0 #define B_MODE_HDLC 1 diff --git a/src/isdn/main.c b/src/isdn/main.c index 2ec711b..9cac592 100644 --- a/src/isdn/main.c +++ b/src/isdn/main.c @@ -24,9 +24,9 @@ #include #include #include -#include "../libdebug/debug.h" -#include "../liboptions/options.h" -#include "../libg711/g711.h" +#include +#include +#include #include #include "isdn.h" #include "dss1.h" 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/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