mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-23 19:24:38 +00:00
build: move code for shared libs in Makefile.am around
Let's sort the code by the dependencies. The shared/ projects have the least dependencies. Move to the beginning.
This commit is contained in:
parent
201c153e25
commit
06ccf3a64d
124
Makefile.am
124
Makefile.am
|
@ -206,6 +206,68 @@ DISTCLEANFILES += $(polkit_policy_DATA)
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
|
noinst_LTLIBRARIES += shared/libcsiphash.la
|
||||||
|
|
||||||
|
shared_libcsiphash_la_CPPFLAGS = \
|
||||||
|
$(CODE_COVERAGE_CFLAGS) \
|
||||||
|
$(SANITIZER_LIB_CFLAGS) \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
shared_libcsiphash_la_SOURCES = \
|
||||||
|
shared/c-siphash/src/c-siphash.c \
|
||||||
|
shared/c-siphash/src/c-siphash.h
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
noinst_LTLIBRARIES += shared/libcrbtree.la
|
||||||
|
|
||||||
|
shared_libcrbtree_la_CFLAGS = $(AM_CFLAGS) -std=c11
|
||||||
|
|
||||||
|
shared_libcrbtree_la_CPPFLAGS = \
|
||||||
|
$(CODE_COVERAGE_CFLAGS) \
|
||||||
|
$(SANITIZER_LIB_CFLAGS) \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
shared_libcrbtree_la_SOURCES = \
|
||||||
|
shared/c-rbtree/src/c-rbtree.c \
|
||||||
|
shared/c-rbtree/src/c-rbtree.h \
|
||||||
|
shared/c-rbtree/src/c-rbtree-private.h
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
noinst_LTLIBRARIES += shared/libnacd.la
|
||||||
|
|
||||||
|
shared_libnacd_la_CFLAGS = $(AM_CFLAGS) -std=c11 -Wno-pointer-arith -Wno-vla
|
||||||
|
shared_libnacd_la_LIBADD = shared/libcrbtree.la
|
||||||
|
|
||||||
|
shared_libnacd_la_CPPFLAGS = \
|
||||||
|
-D_GNU_SOURCE \
|
||||||
|
-DSO_ATTACH_BPF=50 \
|
||||||
|
$(CODE_COVERAGE_CFLAGS) \
|
||||||
|
$(SANITIZER_LIB_CFLAGS) \
|
||||||
|
-I$(srcdir)/shared/c-list/src \
|
||||||
|
-I$(srcdir)/shared/c-siphash/src \
|
||||||
|
-I$(srcdir)/shared/c-rbtree/src \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
shared_libnacd_la_SOURCES = \
|
||||||
|
shared/n-acd/src/n-acd.c \
|
||||||
|
shared/n-acd/src/n-acd.h \
|
||||||
|
shared/n-acd/src/n-acd-private.h \
|
||||||
|
shared/n-acd/src/n-acd-probe.c \
|
||||||
|
shared/n-acd/src/util/timer.c \
|
||||||
|
shared/n-acd/src/util/timer.h
|
||||||
|
|
||||||
|
if WITH_EBPF
|
||||||
|
shared_libnacd_la_SOURCES += shared/n-acd/src/n-acd-bpf.c
|
||||||
|
else
|
||||||
|
shared_libnacd_la_SOURCES += shared/n-acd/src/n-acd-bpf-fallback.c
|
||||||
|
endif
|
||||||
|
|
||||||
|
EXTRA_DIST += shared/c-list/src/c-list.h
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
check_programs += shared/nm-utils/tests/test-shared-general
|
check_programs += shared/nm-utils/tests/test-shared-general
|
||||||
|
|
||||||
shared_nm_utils_tests_test_shared_general_CPPFLAGS = \
|
shared_nm_utils_tests_test_shared_general_CPPFLAGS = \
|
||||||
|
@ -1369,68 +1431,6 @@ noinst_LTLIBRARIES += \
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
noinst_LTLIBRARIES += shared/libcsiphash.la
|
|
||||||
|
|
||||||
shared_libcsiphash_la_CPPFLAGS = \
|
|
||||||
$(CODE_COVERAGE_CFLAGS) \
|
|
||||||
$(SANITIZER_LIB_CFLAGS) \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
shared_libcsiphash_la_SOURCES = \
|
|
||||||
shared/c-siphash/src/c-siphash.c \
|
|
||||||
shared/c-siphash/src/c-siphash.h
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
noinst_LTLIBRARIES += shared/libcrbtree.la
|
|
||||||
|
|
||||||
shared_libcrbtree_la_CFLAGS = $(AM_CFLAGS) -std=c11
|
|
||||||
|
|
||||||
shared_libcrbtree_la_CPPFLAGS = \
|
|
||||||
$(CODE_COVERAGE_CFLAGS) \
|
|
||||||
$(SANITIZER_LIB_CFLAGS) \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
shared_libcrbtree_la_SOURCES = \
|
|
||||||
shared/c-rbtree/src/c-rbtree.c \
|
|
||||||
shared/c-rbtree/src/c-rbtree.h \
|
|
||||||
shared/c-rbtree/src/c-rbtree-private.h
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
noinst_LTLIBRARIES += shared/libnacd.la
|
|
||||||
|
|
||||||
shared_libnacd_la_CFLAGS = $(AM_CFLAGS) -std=c11 -Wno-pointer-arith -Wno-vla
|
|
||||||
shared_libnacd_la_LIBADD = shared/libcrbtree.la
|
|
||||||
|
|
||||||
shared_libnacd_la_CPPFLAGS = \
|
|
||||||
-D_GNU_SOURCE \
|
|
||||||
-DSO_ATTACH_BPF=50 \
|
|
||||||
$(CODE_COVERAGE_CFLAGS) \
|
|
||||||
$(SANITIZER_LIB_CFLAGS) \
|
|
||||||
-I$(srcdir)/shared/c-list/src \
|
|
||||||
-I$(srcdir)/shared/c-siphash/src \
|
|
||||||
-I$(srcdir)/shared/c-rbtree/src \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
shared_libnacd_la_SOURCES = \
|
|
||||||
shared/n-acd/src/n-acd.c \
|
|
||||||
shared/n-acd/src/n-acd.h \
|
|
||||||
shared/n-acd/src/n-acd-private.h \
|
|
||||||
shared/n-acd/src/n-acd-probe.c \
|
|
||||||
shared/n-acd/src/util/timer.c \
|
|
||||||
shared/n-acd/src/util/timer.h
|
|
||||||
|
|
||||||
if WITH_EBPF
|
|
||||||
shared_libnacd_la_SOURCES += shared/n-acd/src/n-acd-bpf.c
|
|
||||||
else
|
|
||||||
shared_libnacd_la_SOURCES += shared/n-acd/src/n-acd-bpf-fallback.c
|
|
||||||
endif
|
|
||||||
|
|
||||||
EXTRA_DIST += shared/c-list/src/c-list.h
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
src_libsystemd_nm_la_cppflags = \
|
src_libsystemd_nm_la_cppflags = \
|
||||||
$(dflt_cppflags) \
|
$(dflt_cppflags) \
|
||||||
-I$(srcdir)/shared \
|
-I$(srcdir)/shared \
|
||||||
|
|
Loading…
Reference in a new issue