diff options
Diffstat (limited to 'src/libsystemd-network')
13 files changed, 22 insertions, 11 deletions
diff --git a/src/libsystemd-network/Makefile b/src/libsystemd-network/Makefile index 96f14f58f2..afd9224056 100644 --- a/src/libsystemd-network/Makefile +++ b/src/libsystemd-network/Makefile @@ -23,5 +23,5 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -at.subdirs += src test +nested.subdirs += src test include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd-network/include/systemd-network/_sd-common.h b/src/libsystemd-network/include/systemd-network/_sd-common.h new file mode 120000 index 0000000000..653327c267 --- /dev/null +++ b/src/libsystemd-network/include/systemd-network/_sd-common.h @@ -0,0 +1 @@ +../../../libsystemd/include/systemd/_sd-common.h
\ No newline at end of file diff --git a/src/libsystemd-network/include/systemd-network/sd-dhcp-client.h b/src/libsystemd-network/include/systemd-network/sd-dhcp-client.h index 4fd418ed35..4704c6b440 100644 --- a/src/libsystemd-network/include/systemd-network/sd-dhcp-client.h +++ b/src/libsystemd-network/include/systemd-network/sd-dhcp-client.h @@ -25,9 +25,9 @@ #include <netinet/in.h> #include <sys/types.h> -#include <systemd/_sd-common.h> #include <systemd/sd-event.h> +#include "_sd-common.h" #include "sd-dhcp-lease.h" _SD_BEGIN_DECLARATIONS; diff --git a/src/libsystemd-network/include/systemd-network/sd-dhcp-lease.h b/src/libsystemd-network/include/systemd-network/sd-dhcp-lease.h index 014288b8c1..2f565ca825 100644 --- a/src/libsystemd-network/include/systemd-network/sd-dhcp-lease.h +++ b/src/libsystemd-network/include/systemd-network/sd-dhcp-lease.h @@ -26,7 +26,7 @@ #include <netinet/in.h> #include <sys/types.h> -#include <systemd/_sd-common.h> +#include "_sd-common.h" _SD_BEGIN_DECLARATIONS; diff --git a/src/libsystemd-network/include/systemd-network/sd-dhcp-server.h b/src/libsystemd-network/include/systemd-network/sd-dhcp-server.h index 8f0cbaefad..bbb2bb203c 100644 --- a/src/libsystemd-network/include/systemd-network/sd-dhcp-server.h +++ b/src/libsystemd-network/include/systemd-network/sd-dhcp-server.h @@ -24,9 +24,10 @@ #include <inttypes.h> #include <netinet/in.h> -#include <systemd/_sd-common.h> #include <systemd/sd-event.h> +#include "_sd-common.h" + _SD_BEGIN_DECLARATIONS; typedef struct sd_dhcp_server sd_dhcp_server; diff --git a/src/libsystemd-network/include/systemd-network/sd-dhcp6-client.h b/src/libsystemd-network/include/systemd-network/sd-dhcp6-client.h index fd30f0cd03..16947079bb 100644 --- a/src/libsystemd-network/include/systemd-network/sd-dhcp6-client.h +++ b/src/libsystemd-network/include/systemd-network/sd-dhcp6-client.h @@ -24,9 +24,9 @@ #include <net/ethernet.h> #include <sys/types.h> -#include <systemd/_sd-common.h> #include <systemd/sd-event.h> +#include "_sd-common.h" #include "sd-dhcp6-lease.h" _SD_BEGIN_DECLARATIONS; diff --git a/src/libsystemd-network/include/systemd-network/sd-dhcp6-lease.h b/src/libsystemd-network/include/systemd-network/sd-dhcp6-lease.h index 3e633548d0..184fbb8e0d 100644 --- a/src/libsystemd-network/include/systemd-network/sd-dhcp6-lease.h +++ b/src/libsystemd-network/include/systemd-network/sd-dhcp6-lease.h @@ -24,7 +24,7 @@ #include <inttypes.h> #include <netinet/in.h> -#include <systemd/_sd-common.h> +#include "_sd-common.h" _SD_BEGIN_DECLARATIONS; diff --git a/src/libsystemd-network/include/systemd-network/sd-ipv4acd.h b/src/libsystemd-network/include/systemd-network/sd-ipv4acd.h index b6ba392921..93db7a4a6c 100644 --- a/src/libsystemd-network/include/systemd-network/sd-ipv4acd.h +++ b/src/libsystemd-network/include/systemd-network/sd-ipv4acd.h @@ -24,9 +24,10 @@ #include <net/ethernet.h> #include <netinet/in.h> -#include <systemd/_sd-common.h> #include <systemd/sd-event.h> +#include "_sd-common.h" + _SD_BEGIN_DECLARATIONS; enum { diff --git a/src/libsystemd-network/include/systemd-network/sd-ipv4ll.h b/src/libsystemd-network/include/systemd-network/sd-ipv4ll.h index 9314360b6f..9167623167 100644 --- a/src/libsystemd-network/include/systemd-network/sd-ipv4ll.h +++ b/src/libsystemd-network/include/systemd-network/sd-ipv4ll.h @@ -23,9 +23,10 @@ #include <net/ethernet.h> #include <netinet/in.h> -#include <systemd/_sd-common.h> #include <systemd/sd-event.h> +#include "_sd-common.h" + _SD_BEGIN_DECLARATIONS; enum { diff --git a/src/libsystemd-network/include/systemd-network/sd-lldp.h b/src/libsystemd-network/include/systemd-network/sd-lldp.h index 6559df44b6..391e7c2a2e 100644 --- a/src/libsystemd-network/include/systemd-network/sd-lldp.h +++ b/src/libsystemd-network/include/systemd-network/sd-lldp.h @@ -24,9 +24,10 @@ #include <inttypes.h> #include <net/ethernet.h> -#include <systemd/_sd-common.h> #include <systemd/sd-event.h> +#include "_sd-common.h" + _SD_BEGIN_DECLARATIONS; typedef struct sd_lldp sd_lldp; diff --git a/src/libsystemd-network/include/systemd-network/sd-ndisc.h b/src/libsystemd-network/include/systemd-network/sd-ndisc.h index e918fef71e..30eb5bc404 100644 --- a/src/libsystemd-network/include/systemd-network/sd-ndisc.h +++ b/src/libsystemd-network/include/systemd-network/sd-ndisc.h @@ -22,10 +22,12 @@ #include <inttypes.h> #include <net/ethernet.h> +#include <netinet/in.h> -#include <systemd/_sd-common.h> #include <systemd/sd-event.h> +#include "_sd-common.h" + _SD_BEGIN_DECLARATIONS; enum { diff --git a/src/libsystemd-network/src/Makefile b/src/libsystemd-network/src/Makefile index 69a415c2bb..30afeae1ef 100644 --- a/src/libsystemd-network/src/Makefile +++ b/src/libsystemd-network/src/Makefile @@ -78,4 +78,8 @@ libsystemd_network_la_SOURCES = \ libsystemd_network_la_LIBADD = \ $(KMOD_LIBS) +sd.CPPFLAGS += $(libsystemd-network.CPPFLAGS) +sd.CPPFLAGS += $(libshared.CPPFLAGS) +sd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd-network/src/network-internal.c b/src/libsystemd-network/src/network-internal.c index d9f7603104..53a2202068 100644 --- a/src/libsystemd-network/src/network-internal.c +++ b/src/libsystemd-network/src/network-internal.c @@ -23,6 +23,7 @@ #include <linux/if.h> #include "basic/alloc-util.h" +#include "basic/ether-addr-util.h" #include "basic/hexdecoct.h" #include "basic/log.h" #include "basic/parse-util.h" @@ -32,7 +33,6 @@ #include "basic/strv.h" #include "basic/utf8.h" #include "basic/util.h" -#include "ether-addr-util.c" #include "shared/condition.h" #include "shared/conf-parser.h" #include "systemd-network/dhcp-lease-internal.h" |