X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=1d37357a35ba04477067ed4a60be88e35208d7a8;hp=6967b6f28906c65df2364454b70f63ee9f0ffb55;hb=49e5b2a93339869703d581a06f8d903f8371ab60;hpb=0fbedd1fdc98ab6d0a29d34b00079afda01b99c1 diff --git a/Makefile.am b/Makefile.am index 6967b6f28..1d37357a3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1095,7 +1095,7 @@ BUILT_SOURCES += \ src/shared/errno-list.txt: $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - < /dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+[0-9]/ { print $$2; }' > $@ + $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - < /dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' > $@ src/shared/errno-from-name.gperf: src/shared/errno-list.txt $(AM_V_at)$(MKDIR_P) $(dir $@) @@ -1107,7 +1107,7 @@ src/shared/errno-from-name.h: src/shared/errno-from-name.gperf src/shared/errno-to-name.h: src/shared/errno-list.txt $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@ + $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@ src/shared/af-list.txt: $(AM_V_at)$(MKDIR_P) $(dir $@) @@ -4134,6 +4134,7 @@ noinst_LTLIBRARIES += \ libsystemd-networkd-core.la libsystemd_networkd_core_la_SOURCES = \ + src/libsystemd-network/network-internal.h \ src/network/networkd.h \ src/network/networkd-link.c \ src/network/networkd-netdev.c \ @@ -4154,16 +4155,23 @@ libsystemd_networkd_core_la_LIBADD = \ libsystemd-shared.la nodist_systemunit_DATA += \ - units/systemd-networkd.service + units/systemd-networkd.service \ + units/systemd-networkd-wait-online.service GENERAL_ALIASES += \ - $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service + $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \ + $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service rootlibexec_PROGRAMS += \ systemd-networkd-wait-online systemd_networkd_wait_online_SOURCES = \ - src/network/networkd-wait-online.c + src/libsystemd-network/network-internal.h \ + src/network/networkd-wait-online.c \ + src/network/networkd-wait-online.h + +nodist_systemd_networkd_wait_online_SOURCES = \ + src/network/networkd-wait-online-gperf.c systemd_networkd_wait_online_LDADD = \ libsystemd-internal.la \ @@ -4178,14 +4186,19 @@ test_network_LDADD = \ tests += \ test-network +dist_pkgsysconf_DATA += \ + src/network/networkd-wait-online.conf + EXTRA_DIST += \ src/network/networkd-network-gperf.gperf \ src/network/networkd-netdev-gperf.gperf \ + src/network/networkd-wait-online-gperf.gperf \ units/systemd-networkd.service.in CLEANFILES += \ src/network/networkd-network-gperf.c \ - src/network/networkd-netdev-gperf.c + src/network/networkd-netdev-gperf.c \ + src/network/networkd-wait-online-gperf.c endif # ------------------------------------------------------------------------------