diff options
Diffstat (limited to 'src/libshared')
| -rw-r--r-- | src/libshared/Makefile | 29 | ||||
| -rw-r--r-- | src/libshared/local-addresses.c | 1 |
2 files changed, 28 insertions, 2 deletions
diff --git a/src/libshared/Makefile b/src/libshared/Makefile index 67a19f4e21..778a6ec0ec 100644 --- a/src/libshared/Makefile +++ b/src/libshared/Makefile @@ -27,6 +27,8 @@ noinst_LTLIBRARIES += \ libshared.la libshared_la_SOURCES = \ + src/libsystemd/sd-netlink/local-addresses.h \ + src/libsystemd/sd-netlink/local-addresses.c \ src/shared/output-mode.h \ src/shared/output-mode.c \ src/shared/gpt.h \ @@ -135,7 +137,7 @@ libshared_la_CFLAGS = \ libshared_la_LIBADD = \ libsystemd-internal.la \ libsystemd-journal-internal.la \ - libudev-internal.la \ + libudev.la \ $(ACL_LIBS) \ $(LIBIDN_LIBS) \ $(SECCOMP_LIBS) @@ -146,4 +148,29 @@ test_local_addresses_SOURCES = \ test_local_addresses_LDADD = \ libshared.la +at.depdirs += $(topoutdir)/src/libsystemd/libsystemd-internal +at.depdirs += $(topoutdir)/src/libsystemd/libsystemd-journal-internal +at.depdirs += $(topoutdir)/src/libudev/src +systemd.CPPFLAGS += $(libbasic.CPPFLAGS) +systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) +systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal +systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus + +systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" +systemd.CPPFLAGS += -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" +systemd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" +systemd.CPPFLAGS += -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" +systemd.CPPFLAGS += -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" +systemd.CPPFLAGS += -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" +systemd.CPPFLAGS += -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" + +systemd.CPPFLAGS += -DSYSTEMD_FSCK_PATH=\"$(rootlibexecdir)/systemd-fsck\" + +systemd.CPPFLAGS += -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" + +systemd.CPPFLAGS += -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" +systemd.CPPFLAGS += -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" + +systemd.CPPFLAGS += -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libshared/local-addresses.c b/src/libshared/local-addresses.c index 1abce75b01..5cceddd03c 100644 --- a/src/libshared/local-addresses.c +++ b/src/libshared/local-addresses.c @@ -23,7 +23,6 @@ #include "alloc-util.h" #include "local-addresses.h" #include "macro.h" -#include "netlink-util.h" static int address_compare(const void *_a, const void *_b) { const struct local_address *a = _a, *b = _b; |