diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-12 12:25:04 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-12 12:25:04 -0400 |
commit | 4cb2380233342aa01fda978be775c9a735fce3a2 (patch) | |
tree | 44c0d777b953effee759c1aeb607f17e831a8348 /src | |
parent | 16ec24d89c754c376e4420cc37e896c85f8df85e (diff) |
fixity
Diffstat (limited to 'src')
-rw-r--r-- | src/grp-boot/bootctl/Makefile | 1 | ||||
-rw-r--r-- | src/grp-machine/Makefile | 1 | ||||
-rw-r--r-- | src/grp-machine/nss-mymachines/Makefile | 1 | ||||
-rw-r--r-- | src/libshared/Makefile | 1 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/Makefile | 11 | ||||
l--------- | src/systemd-nspawn/machine-id-setup.c | 1 | ||||
l--------- | src/systemd-nspawn/machine-id-setup.h | 1 |
7 files changed, 11 insertions, 6 deletions
diff --git a/src/grp-boot/bootctl/Makefile b/src/grp-boot/bootctl/Makefile index e44caea1ec..221257b905 100644 --- a/src/grp-boot/bootctl/Makefile +++ b/src/grp-boot/bootctl/Makefile @@ -52,6 +52,7 @@ dist_zshcompletion_data += \ endif # HAVE_BLKID endif # ENABLE_EFI +bootctl_LDADD += libbasic.la # was hidden by libshared->libsystemd->libbasic systemd.CPPFLAGS += $(libshared.CPPFLAGS) systemd.CPPFLAGS += $(libbasic.CPPFLAGS) diff --git a/src/grp-machine/Makefile b/src/grp-machine/Makefile index 7412341233..59142f78bd 100644 --- a/src/grp-machine/Makefile +++ b/src/grp-machine/Makefile @@ -24,6 +24,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk at.subdirs += machinectl systemd-machined +at.subdirs += libmachine-core at.subdirs += nss-mymachines include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-machine/nss-mymachines/Makefile b/src/grp-machine/nss-mymachines/Makefile index 5042e170e2..454ab3f90e 100644 --- a/src/grp-machine/nss-mymachines/Makefile +++ b/src/grp-machine/nss-mymachines/Makefile @@ -43,6 +43,7 @@ libnss_mymachines_la_LIBADD = \ lib_LTLIBRARIES += \ libnss_mymachines.la +libnss_mymachines_la_LIBADD += libbasic.la # was hidden by libsystemd->libbasic systemd.CPPFLAGS += $(libbasic.CPPFLAGS) systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus diff --git a/src/libshared/Makefile b/src/libshared/Makefile index b3d0698ffe..9846a197c4 100644 --- a/src/libshared/Makefile +++ b/src/libshared/Makefile @@ -148,6 +148,7 @@ test_local_addresses_SOURCES = \ test_local_addresses_LDADD = \ libshared.la +libshared_la_LIBADD += libbasic.la # was hidden by libsystemd->libbasic systemd.CPPFLAGS += $(libbasic.CPPFLAGS) systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal diff --git a/src/libsystemd/libsystemd-internal/Makefile b/src/libsystemd/libsystemd-internal/Makefile index 1637753248..be314d91c4 100644 --- a/src/libsystemd/libsystemd-internal/Makefile +++ b/src/libsystemd/libsystemd-internal/Makefile @@ -23,7 +23,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -libsystemd_internal_la_SOURCES = \ +_libsystemd_internal_la_SOURCES = \ src/systemd/sd-bus.h \ src/systemd/sd-bus-protocol.h \ src/systemd/sd-bus-vtable.h \ @@ -115,7 +115,7 @@ libsystemd_internal_la_LIBADD = \ libbasic.la \ -lresolv -_noinst_LTLIBRARIES += \ +noinst_LTLIBRARIES += \ libsystemd-internal.la test_bus_marshal_SOURCES = \ @@ -242,9 +242,8 @@ test_resolve_SOURCES = \ test_resolve_LDADD = \ libshared.la -at.out_files += libsystemd-internal.la -libsystemd-internal.la_SOURCES = $(patsubst src/libsystemd/%,%,$(filter %.c,$(libsystemd_internal_la_SOURCES))) -$(outdir)/libsystemd-internal.la: $(addprefix $(outdir)/,$(libsystemd-internal.la_SOURCES:.c=.o)) -at.subdirs += $(sort $(patsubst %/,%,$(dir $(libsystemd-internal.la_SOURCES)))) +libsystemd-internal.la.SOURCES = $(patsubst src/libsystemd/%,%,$(filter %.c,$(_libsystemd_internal_la_SOURCES))) +libsystemd-internal.la.DEPENDS = $(addprefix $(outdir)/,$(libsystemd-internal.la.SOURCES:.c=.lo)) +at.subdirs += $(sort $(dir $(libsystemd-internal.la.SOURCES))) include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-nspawn/machine-id-setup.c b/src/systemd-nspawn/machine-id-setup.c new file mode 120000 index 0000000000..2f0f2d8cf1 --- /dev/null +++ b/src/systemd-nspawn/machine-id-setup.c @@ -0,0 +1 @@ +../libcore/machine-id-setup.c
\ No newline at end of file diff --git a/src/systemd-nspawn/machine-id-setup.h b/src/systemd-nspawn/machine-id-setup.h new file mode 120000 index 0000000000..6b34cb74f4 --- /dev/null +++ b/src/systemd-nspawn/machine-id-setup.h @@ -0,0 +1 @@ +../libcore/machine-id-setup.h
\ No newline at end of file |