Move from local to external osmo* libraries
src/libdebug -> libosmocore src/libselect -> libosmocore src/libtimer -> libosmocore src/libosmocc -> libosmo-cc src/libg711 -> libosmo-cc
This commit is contained in:
@@ -19,12 +19,13 @@ osmotv_SOURCES = \
|
||||
osmotv_LDADD = \
|
||||
$(COMMON_LA) \
|
||||
$(top_builddir)/src/liboptions/liboptions.a \
|
||||
$(top_builddir)/src/libdebug/libdebug.a \
|
||||
$(top_builddir)/src/libimage/libimage.a \
|
||||
$(top_builddir)/src/libfm/libfm.a \
|
||||
$(top_builddir)/src/libfilter/libfilter.a \
|
||||
$(top_builddir)/src/libwave/libwave.a \
|
||||
$(top_builddir)/src/libsample/libsample.a \
|
||||
$(top_builddir)/src/liblogging/liblogging.a \
|
||||
$(LIBOSMOCORE_LIBS) \
|
||||
$(ALSA_LIBS) \
|
||||
$(IMAGEMAGICK_LIBS) \
|
||||
-lm
|
||||
@@ -36,8 +37,7 @@ osmotv_LDADD += \
|
||||
endif
|
||||
|
||||
osmotv_LDADD += \
|
||||
$(top_builddir)/src/libdisplay/libdisplay.a \
|
||||
$(top_builddir)/src/libtimer/libtimer.a
|
||||
$(top_builddir)/src/libdisplay/libdisplay.a
|
||||
|
||||
if HAVE_SDR
|
||||
osmotv_LDADD += \
|
||||
|
@@ -33,7 +33,7 @@ enum paging_signal;
|
||||
#include "../libfm/fm.h"
|
||||
#include "../libwave/wave.h"
|
||||
#include "../libimage/img.h"
|
||||
#include "../libdebug/debug.h"
|
||||
#include "../liblogging/logging.h"
|
||||
#ifdef HAVE_SDR
|
||||
#include "../libsdr/sdr_config.h"
|
||||
#include "../libsdr/sdr.h"
|
||||
@@ -495,7 +495,8 @@ int main(int argc, char *argv[])
|
||||
{
|
||||
int __attribute__((__unused__)) rc, argi;
|
||||
|
||||
debuglevel = 0;
|
||||
loglevel = LOGL_DEBUG;
|
||||
logging_init();
|
||||
|
||||
#ifdef HAVE_SDR
|
||||
sdr_config_init(DEFAULT_LO_OFFSET);
|
||||
@@ -568,3 +569,5 @@ int main(int argc, char *argv[])
|
||||
return 0;
|
||||
}
|
||||
|
||||
void osmo_cc_set_log_cat(void) {}
|
||||
|
||||
|
Reference in New Issue
Block a user