Move src/*.{c,h} to src/core/

This way we have all libosmocore.so in an own subdir instead of having
lots of files in the parent dir, which also contains subdirs to other
libraries.
This also matches the schema under include/osmocom/.

Change-Id: I6c76fafebdd5e961aed88bbecd2c16bc69d580e2
This commit is contained in:
Pau Espin 2023-01-18 17:04:04 +01:00
parent cc296c9293
commit d4c3dc8d59
77 changed files with 148 additions and 142 deletions

View File

@ -610,7 +610,7 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
INPUT = @srcdir@/include/osmocom/core @srcdir@/src
INPUT = @srcdir@/include/osmocom/core @srcdir@/src/core
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

View File

@ -4,15 +4,6 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
SUBDIRS = \
include \
src \
src/vty \
src/codec \
src/gsm \
src/coding \
src/gb \
src/ctrl \
src/sim \
src/pseudotalloc \
src/usb \
utils \
tapset \
tests \
@ -90,8 +81,8 @@ apidoc: $(HTML)
$(top_builddir)/doc/libosmocore.tag.prep: $(top_builddir)/Doxyfile.core \
$(top_srcdir)/include/osmocom/core/*.h \
$(top_srcdir)/src/*.[hc] \
$(top_srcdir)/src/crcXXgen.c.tpl \
$(top_srcdir)/src/core/*.[hc] \
$(top_srcdir)/src/core/crcXXgen.c.tpl \
$(top_srcdir)/src/pseudotalloc/*.[hc]
rm -rf $(top_builddir)/doc/core; mkdir -p $(top_builddir)/doc/core
rm -rf $(top_builddir)/doc/libosmocore.map

View File

@ -586,6 +586,7 @@ AC_OUTPUT(
libosmousb.pc
include/Makefile
src/Makefile
src/core/Makefile
src/vty/Makefile
src/codec/Makefile
src/coding/Makefile

14
debian/copyright vendored
View File

@ -13,23 +13,23 @@ License: GPL-2+
Files: include/osmocom/core/loggingrb.h
include/osmocom/core/strrb.h
src/strrb.c
src/loggingrb.c
src/core/strrb.c
src/core/loggingrb.c
Copyright: 2012-2013 Katerina Barone-Adesi <kat.obsc@gmail.com>
License: GPL-2+
Files: include/osmocom/core/linuxrbtree.h
src/rbtree.c
src/core/rbtree.c
Copyright: 1999 Andrea Arcangeli <andrea@suse.de>
2002 David Woodhouse <dwmw2@infradead.org>
License: GPL-2+
Files: include/osmocom/core/crc16.h
src/crc16.c
src/core/crc16.c
Copyright: 2005 Ben Gardner <bgardner@wabtec.com>
License: GPL-2
Files: src/utils.c
Files: src/core/utils.c
Copyright: 2011 Harald Welte <laforge@gnumonks.org>
2011 Sylvain Munaut <tnt@246tNt.com>
2014 Nils O. Selåsdal <noselasd@fiane.dyndns.org>
@ -100,8 +100,8 @@ Copyright: 1997,1998 Kunihiro Ishiguro
License: GPL-2+
Files: include/osmocom/core/stats.h
src/stat_item.c
src/stats.c
src/core/stat_item.c
src/core/stats.c
src/vty/stats_vty.c
tests/stats/stats_test.c
Copyright: 2009-2010 by Harald Welte <laforge@gnumonks.org>

View File

@ -1,108 +1,12 @@
# This is _NOT_ the library release version, it's an API version.
# Please read chapter "Library interface versions" of the libtool documentation
# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html
LIBVERSION=19:0:0
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS)
if ENABLE_PSEUDOTALLOC
AM_CPPFLAGS += -I$(top_srcdir)/src/pseudotalloc
endif
lib_LTLIBRARIES = libosmocore.la
libosmocore_la_LIBADD = $(BACKTRACE_LIB) $(TALLOC_LIBS) $(LIBRARY_RT) $(PTHREAD_LIBS) $(LIBSCTP_LIBS)
libosmocore_la_SOURCES = context.c timer.c timer_gettimeofday.c timer_clockgettime.c \
select.c signal.c msgb.c bits.c \
bitvec.c bitcomp.c counter.c fsm.c \
write_queue.c utils.c socket.c \
logging.c logging_syslog.c logging_gsmtap.c rate_ctr.c \
gsmtap_util.c crc16.c panic.c backtrace.c \
conv.c application.c rbtree.c strrb.c \
loggingrb.c crc8gen.c crc16gen.c crc32gen.c crc64gen.c \
macaddr.c stat_item.c stats.c stats_statsd.c prim.c \
stats_tcp.c \
conv_acc.c conv_acc_generic.c sercomm.c prbs.c \
isdnhdlc.c \
tdef.c \
thread.c \
time_cc.c \
sockaddr_str.c \
use_count.c \
exec.c \
it_q.c \
probes.d \
base64.c \
$(NULL)
if HAVE_SSSE3
libosmocore_la_SOURCES += conv_acc_sse.c
if HAVE_SSE4_1
conv_acc_sse.lo : AM_CFLAGS += -mssse3 -msse4.1
else
conv_acc_sse.lo : AM_CFLAGS += -mssse3
endif
if HAVE_AVX2
libosmocore_la_SOURCES += conv_acc_sse_avx.c
if HAVE_SSE4_1
conv_acc_sse_avx.lo : AM_CFLAGS += -mssse3 -mavx2 -msse4.1
else
conv_acc_sse_avx.lo : AM_CFLAGS += -mssse3 -mavx2
endif
endif
endif
if HAVE_NEON
libosmocore_la_SOURCES += conv_acc_neon.c
# conv_acc_neon.lo : AM_CFLAGS += -mfpu=neon no, could as well be vfp with neon
endif
BUILT_SOURCES = crc8gen.c crc16gen.c crc32gen.c crc64gen.c
EXTRA_DIST = \
conv_acc_sse_impl.h \
conv_acc_neon_impl.h \
crcXXgen.c.tpl \
stat_item_internal.h \
$(NULL)
libosmocore_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
if ENABLE_PLUGIN
libosmocore_la_SOURCES += plugin.c
libosmocore_la_LIBADD += $(LIBRARY_DLOPEN)
endif
if ENABLE_MSGFILE
libosmocore_la_SOURCES += msgfile.c
endif
if ENABLE_SERIAL
libosmocore_la_SOURCES += serial.c
endif
if ENABLE_SYSTEMD_LOGGING
libosmocore_la_SOURCES += logging_systemd.c
libosmocore_la_LIBADD += $(SYSTEMD_LIBS)
endif
if ENABLE_LIBMNL
libosmocore_la_SOURCES += mnl.c
libosmocore_la_LIBADD += $(LIBMNL_LIBS)
endif
if ENABLE_SYSTEMTAP
probes.h: probes.d
$(DTRACE) -C -h -s $< -o $@
probes.lo: probes.d
$(LIBTOOL) --mode=compile $(AM_V_lt) --tag=CC env CFLAGS="$(CFLAGS)" $(DTRACE) -C -G -s $< -o $@
BUILT_SOURCES += probes.h probes.lo
libosmocore_la_LIBADD += probes.lo
endif
crc%gen.c: crcXXgen.c.tpl
$(AM_V_GEN)sed -e's/XX/$*/g' $< > $@
SUBDIRS = \
core \
vty \
codec \
gsm \
coding \
gb \
ctrl \
pseudotalloc \
sim \
usb \
$(NULL)

View File

@ -15,4 +15,4 @@ lib_LTLIBRARIES = libosmocodec.la
libosmocodec_la_SOURCES = gsm610.c gsm620.c gsm660.c gsm690.c ecu.c ecu_fr.c
libosmocodec_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
libosmocodec_la_LIBADD = $(top_builddir)/src/libosmocore.la
libosmocodec_la_LIBADD = $(top_builddir)/src/core/libosmocore.la

View File

@ -27,9 +27,11 @@ libosmocoding_la_LDFLAGS = \
$(LIBVERSION) \
-no-undefined \
$(TALLOC_LIBS)
libosmocoding_la_LIBADD = \
../libosmocore.la \
../gsm/libosmogsm.la \
../codec/libosmocodec.la
$(top_builddir)/src/core/libosmocore.la \
$(top_builddir)/src/gsm/libosmogsm.la \
$(top_builddir)/src/codec/libosmocodec.la \
$(NULL)
EXTRA_DIST = libosmocoding.map

108
src/core/Makefile.am Normal file
View File

@ -0,0 +1,108 @@
# This is _NOT_ the library release version, it's an API version.
# Please read chapter "Library interface versions" of the libtool documentation
# before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html
LIBVERSION=19:0:0
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS)
if ENABLE_PSEUDOTALLOC
AM_CPPFLAGS += -I$(top_srcdir)/src/pseudotalloc
endif
lib_LTLIBRARIES = libosmocore.la
libosmocore_la_LIBADD = $(BACKTRACE_LIB) $(TALLOC_LIBS) $(LIBRARY_RT) $(PTHREAD_LIBS) $(LIBSCTP_LIBS)
libosmocore_la_SOURCES = context.c timer.c timer_gettimeofday.c timer_clockgettime.c \
select.c signal.c msgb.c bits.c \
bitvec.c bitcomp.c counter.c fsm.c \
write_queue.c utils.c socket.c \
logging.c logging_syslog.c logging_gsmtap.c rate_ctr.c \
gsmtap_util.c crc16.c panic.c backtrace.c \
conv.c application.c rbtree.c strrb.c \
loggingrb.c crc8gen.c crc16gen.c crc32gen.c crc64gen.c \
macaddr.c stat_item.c stats.c stats_statsd.c prim.c \
stats_tcp.c \
conv_acc.c conv_acc_generic.c sercomm.c prbs.c \
isdnhdlc.c \
tdef.c \
thread.c \
time_cc.c \
sockaddr_str.c \
use_count.c \
exec.c \
it_q.c \
probes.d \
base64.c \
$(NULL)
if HAVE_SSSE3
libosmocore_la_SOURCES += conv_acc_sse.c
if HAVE_SSE4_1
conv_acc_sse.lo : AM_CFLAGS += -mssse3 -msse4.1
else
conv_acc_sse.lo : AM_CFLAGS += -mssse3
endif
if HAVE_AVX2
libosmocore_la_SOURCES += conv_acc_sse_avx.c
if HAVE_SSE4_1
conv_acc_sse_avx.lo : AM_CFLAGS += -mssse3 -mavx2 -msse4.1
else
conv_acc_sse_avx.lo : AM_CFLAGS += -mssse3 -mavx2
endif
endif
endif
if HAVE_NEON
libosmocore_la_SOURCES += conv_acc_neon.c
# conv_acc_neon.lo : AM_CFLAGS += -mfpu=neon no, could as well be vfp with neon
endif
BUILT_SOURCES = crc8gen.c crc16gen.c crc32gen.c crc64gen.c
EXTRA_DIST = \
conv_acc_sse_impl.h \
conv_acc_neon_impl.h \
crcXXgen.c.tpl \
stat_item_internal.h \
$(NULL)
libosmocore_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
if ENABLE_PLUGIN
libosmocore_la_SOURCES += plugin.c
libosmocore_la_LIBADD += $(LIBRARY_DLOPEN)
endif
if ENABLE_MSGFILE
libosmocore_la_SOURCES += msgfile.c
endif
if ENABLE_SERIAL
libosmocore_la_SOURCES += serial.c
endif
if ENABLE_SYSTEMD_LOGGING
libosmocore_la_SOURCES += logging_systemd.c
libosmocore_la_LIBADD += $(SYSTEMD_LIBS)
endif
if ENABLE_LIBMNL
libosmocore_la_SOURCES += mnl.c
libosmocore_la_LIBADD += $(LIBMNL_LIBS)
endif
if ENABLE_SYSTEMTAP
probes.h: probes.d
$(DTRACE) -C -h -s $< -o $@
probes.lo: probes.d
$(LIBTOOL) --mode=compile $(AM_V_lt) --tag=CC env CFLAGS="$(CFLAGS)" $(DTRACE) -C -G -s $< -o $@
BUILT_SOURCES += probes.h probes.lo
libosmocore_la_LIBADD += probes.lo
endif
crc%gen.c: crcXXgen.c.tpl
$(AM_V_GEN)sed -e's/XX/$*/g' $< > $@

View File

@ -13,7 +13,7 @@ libosmoctrl_la_SOURCES = control_cmd.c control_if.c fsm_ctrl_commands.c
libosmoctrl_la_LDFLAGS = $(LTLDFLAGS_OSMOCTRL) -version-info $(LIBVERSION) -no-undefined
libosmoctrl_la_LIBADD = $(TALLOC_LIBS) \
$(top_builddir)/src/libosmocore.la \
$(top_builddir)/src/core/libosmocore.la \
$(top_builddir)/src/gsm/libosmogsm.la \
$(top_builddir)/src/vty/libosmovty.la

View File

@ -21,7 +21,7 @@ libosmogb_la_LDFLAGS = \
-no-undefined \
$(NULL)
libosmogb_la_LIBADD = $(TALLOC_LIBS) \
$(top_builddir)/src/libosmocore.la \
$(top_builddir)/src/core/libosmocore.la \
$(top_builddir)/src/vty/libosmovty.la \
$(top_builddir)/src/gsm/libosmogsm.la

View File

@ -36,7 +36,7 @@ libgsmint_la_SOURCES = a5.c rxlev_stat.c tlv_parser.c comp128.c comp128v23.c \
gad.c bsslap.c bssmap_le.c kdf.c iuup.c
libgsmint_la_LDFLAGS = -no-undefined
libgsmint_la_LIBADD = $(top_builddir)/src/libosmocore.la
libgsmint_la_LIBADD = $(top_builddir)/src/core/libosmocore.la
libosmogsm_la_SOURCES =
libosmogsm_la_LDFLAGS = $(LTLDFLAGS_OSMOGSM) -version-info $(LIBVERSION) -no-undefined

View File

@ -20,7 +20,7 @@ libosmosim_la_LDFLAGS = \
-no-undefined \
$(NULL)
libosmosim_la_LIBADD = \
$(top_builddir)/src/libosmocore.la \
$(top_builddir)/src/core/libosmocore.la \
$(top_builddir)/src/gsm/libosmogsm.la \
$(TALLOC_LIBS)
if ENABLE_PCSC

View File

@ -17,7 +17,7 @@ libosmousb_la_LDFLAGS = \
-no-undefined \
$(NULL)
libosmousb_la_LIBADD = \
$(top_builddir)/src/libosmocore.la \
$(top_builddir)/src/core/libosmocore.la \
$(TALLOC_LIBS) \
$(LIBUSB_LIBS)

View File

@ -14,5 +14,5 @@ libosmovty_la_SOURCES = buffer.c command.c vty.c vector.c utils.c \
fsm_vty.c talloc_ctx_vty.c \
cpu_sched_vty.c tdef_vty.c
libosmovty_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
libosmovty_la_LIBADD = $(top_builddir)/src/libosmocore.la $(TALLOC_LIBS) $(PTHREAD_LIBS)
libosmovty_la_LIBADD = $(top_builddir)/src/core/libosmocore.la $(TALLOC_LIBS) $(PTHREAD_LIBS)
endif

View File

@ -1,7 +1,7 @@
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS)
AM_LDFLAGS = -no-install
LDADD = $(top_builddir)/src/libosmocore.la $(TALLOC_LIBS) $(PTHREAD_LIBS)
LDADD = $(top_builddir)/src/core/libosmocore.la $(TALLOC_LIBS) $(PTHREAD_LIBS)
if ENABLE_SERCOM_STUB
noinst_LIBRARIES = libsercomstub.a
@ -93,7 +93,7 @@ utils_utils_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
stats_stats_test_SOURCES = stats/stats_test.c
stats_stats_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
stats_stats_test_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src
stats_stats_test_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/core
stats_stats_vty_test_SOURCES = stats/stats_vty_test.c
stats_stats_vty_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la
@ -209,7 +209,7 @@ gb_gprs_ns2_test_SOURCES = gb/gprs_ns2_test.c
gb_gprs_ns2_test_LDADD = $(LDADD) $(LIBRARY_DLSYM) \
$(top_builddir)/src/vty/libosmovty.la \
$(top_builddir)/src/gsm/libosmogsm.la \
$(top_builddir)/src/libosmocore.la \
$(top_builddir)/src/core/libosmocore.la \
$(top_builddir)/src/gb/libosmogb-test.la
if ENABLE_LIBMNL
gb_gprs_ns2_test_LDADD += $(LIBMNL_LIBS)

View File

@ -3,7 +3,7 @@ bin_PROGRAMS =
noinst_PROGRAMS =
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS)
LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la $(PTHREAD_LIBS)
LDADD = $(top_builddir)/src/core/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la $(PTHREAD_LIBS)
if ENABLE_UTILITIES
EXTRA_DIST = conv_gen.py conv_codes_gsm.py

View File

@ -4,7 +4,7 @@ osmo_stat_dummy_SOURCES = osmo-stat-dummy.c
osmo_stat_dummy_LDADD = $(LDADD) $(TALLOC_LIBS) \
$(top_builddir)/src/vty/libosmovty.la \
$(top_builddir)/src/ctrl/libosmoctrl.la \
$(top_builddir)/src/libosmocore.la
$(top_builddir)/src/core/libosmocore.la
osmo_stat_dummy_CFLAGS = -Wall $(TALLOC_CFLAGS) $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOCTRL_CFLAGS)
osmo_stat_dummy_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
endif