diff options
Diffstat (limited to 'src/libshared')
| -rw-r--r-- | src/libshared/Makefile | 33 | ||||
| -rw-r--r-- | src/libshared/local-addresses.c | 1 |
2 files changed, 30 insertions, 4 deletions
diff --git a/src/libshared/Makefile b/src/libshared/Makefile index e58f999e2b..4e05381339 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/gpt.h \ src/shared/udev-util.h \ @@ -130,9 +132,9 @@ libshared_la_CFLAGS = \ $(SECCOMP_CFLAGS) libshared_la_LIBADD = \ - libsystemd-internal.la \ - libsystemd-journal-internal.la \ - libudev-internal.la \ + $(topoutdir)/src/libsystemd/libsystemd-internal/libsystemd-internal.la \ + $(topoutdir)/src/libsystemd/libsystemd-journal-internal/libsystemd-journal-internal.la \ + $(topoutdir)/src/libudev/src/libudev.la \ $(ACL_LIBS) \ $(LIBIDN_LIBS) \ $(SECCOMP_LIBS) @@ -144,4 +146,29 @@ test_local_addresses_LDADD = \ libshared.la $(eval $(value automake2autothing)) +at.depdirs += $(topoutdir)/src/libsystemd/libsystemd-internal +at.depdirs += $(topoutdir)/src/libsystemd/libsystemd-journal-internal +at.depdirs += $(topoutdir)/src/libudev/src +AM_CPPFLAGS += $(libbasic.CPPFLAGS) +AM_CPPFLAGS += $(libsystemd.CPPFLAGS) +AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal +AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus + +AM_CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" +AM_CPPFLAGS += -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" +AM_CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" +AM_CPPFLAGS += -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" +AM_CPPFLAGS += -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" +AM_CPPFLAGS += -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" +AM_CPPFLAGS += -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" + +AM_CPPFLAGS += -DSYSTEMD_FSCK_PATH=\"$(rootlibexecdir)/systemd-fsck\" + +AM_CPPFLAGS += -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" + +AM_CPPFLAGS += -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" +AM_CPPFLAGS += -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" + +AM_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 e6feb859cd..fafc208eca 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; |