diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 01:56:30 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 01:56:30 -0400 |
| commit | 713437afd70748d3c951db8daea68861b459bde4 (patch) | |
| tree | 725b21fcd6526bb6ebaa54ce0c5dfa1a75c1b390 | |
| parent | e79b48788853612eeadb7874df1e5968220c5c66 (diff) | |
stuff
| -rw-r--r-- | build-aux/Makefile.each.tail/30-module.mk | 4 | ||||
| -rw-r--r-- | src/grp-machine/libmachine-core/Makefile | 1 | ||||
| -rw-r--r-- | src/libshared/local-addresses.c (renamed from src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.c) | 0 | ||||
| -rw-r--r-- | src/libshared/local-addresses.h (renamed from src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.h) | 0 | ||||
| -rw-r--r-- | src/systemd-nspawn/Makefile | 1 | ||||
| l--------- | src/systemd-nspawn/local-addresses.c | 1 | ||||
| l--------- | src/systemd-nspawn/local-addresses.h | 1 |
7 files changed, 5 insertions, 3 deletions
diff --git a/build-aux/Makefile.each.tail/30-module.mk b/build-aux/Makefile.each.tail/30-module.mk new file mode 100644 index 0000000000..10ebc4c1de --- /dev/null +++ b/build-aux/Makefile.each.tail/30-module.mk @@ -0,0 +1,4 @@ +dir_variables = $(foreach v,$(filter-out _%,$(patsubst %/$(@D),%,$(filter %/$(@D),$(.VARIABLES)))),$(if $(findstring /,$v),, $v)) +$(outdir)/directory-info: + $(AM_V_at)printf '%s = %s\n' $(foreach v,$(dir_variables),'$v' '$($v/$(@D))') | sort | column -s= -o= -t +.PHONY: $(outdir)/module-info diff --git a/src/grp-machine/libmachine-core/Makefile b/src/grp-machine/libmachine-core/Makefile index e7583cb4c9..b41a1d77e8 100644 --- a/src/grp-machine/libmachine-core/Makefile +++ b/src/grp-machine/libmachine-core/Makefile @@ -51,5 +51,6 @@ $(eval $(value automake2autothing)) at.depdirs += $(topoutdir)/src/libsystemd/libsystemd-internal AM_CPPFLAGS += $(libshared.CPPFLAGS) AM_CPPFLAGS += $(libbasic.CPPFLAGS) +AM_CPPFLAGS += $(libsystemd.CPPFLAGS) AM_CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.c b/src/libshared/local-addresses.c index fafc208eca..fafc208eca 100644 --- a/src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.c +++ b/src/libshared/local-addresses.c diff --git a/src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.h b/src/libshared/local-addresses.h index 1ddc50ace5..1ddc50ace5 100644 --- a/src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.h +++ b/src/libshared/local-addresses.h diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile index 2485936f37..4c7606494f 100644 --- a/src/systemd-nspawn/Makefile +++ b/src/systemd-nspawn/Makefile @@ -66,7 +66,6 @@ systemd_nspawn_LDADD += \ $(topoutdir)/src/libfirewall/libfirewall.la endif # HAVE_LIBIPTC -systemd_nspawn_SOURCES += local-addresses.c bin_PROGRAMS += systemd-nspawn $(eval $(value automake2autothing)) at.depdirs += $(topoutdir)/src/libshared $(if $(HAVE_LIBIPTC),$(topoutdir)/src/libfirewall) diff --git a/src/systemd-nspawn/local-addresses.c b/src/systemd-nspawn/local-addresses.c deleted file mode 120000 index c9636cacab..0000000000 --- a/src/systemd-nspawn/local-addresses.c +++ /dev/null @@ -1 +0,0 @@ -../libsystemd/libsystemd-internal/sd-netlink/local-addresses.c
\ No newline at end of file diff --git a/src/systemd-nspawn/local-addresses.h b/src/systemd-nspawn/local-addresses.h deleted file mode 120000 index 7d801fe75c..0000000000 --- a/src/systemd-nspawn/local-addresses.h +++ /dev/null @@ -1 +0,0 @@ -../libsystemd/libsystemd-internal/sd-netlink/local-addresses.h
\ No newline at end of file |