diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 19:00:45 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 19:00:45 -0400 |
| commit | 20ffc795870deefd38eaf89171a7b06abf71de31 (patch) | |
| tree | 46bf9f1ae71a1e25b05d3956c192e9b1163e9fab | |
| parent | 0ff87b898afb47596de94d9767cf4cb19d2d69e0 (diff) | |
more stuff
| -rw-r--r-- | build-aux/Makefile.once.head/20-systemd.mk | 5 | ||||
| -rw-r--r-- | src/systemd-nspawn/Makefile | 33 |
2 files changed, 12 insertions, 26 deletions
diff --git a/build-aux/Makefile.once.head/20-systemd.mk b/build-aux/Makefile.once.head/20-systemd.mk index 2a2f3a7ac5..701a9b8377 100644 --- a/build-aux/Makefile.once.head/20-systemd.mk +++ b/build-aux/Makefile.once.head/20-systemd.mk @@ -131,7 +131,7 @@ define generate-sym-test $(AM_V_at)printf 'return 0; }\n' >> $@ endef -at.dirlocal += noinst_LTLIBRARIES lib_LTLIBRARIES +at.dirlocal += noinst_LTLIBRARIES lib_LTLIBRARIES bin_PROGRAMS automake_name = $(subst -,_,$(subst .,_,$1)) automake_sources = $(addprefix $(outdir)/,$(notdir $($(automake_name)_SOURCES) $(nodist_$(automake_name)_SOURCES))) automake_lo = $(patsubst %.c,%.lo,$(filter %.c,$(automake_sources))) @@ -139,8 +139,9 @@ automake_o = $(patsubst %.c,%.o,$(filter %.c,$(automake_sources))) automake_libs = $($(automake_name)_LIBADD) define automake2autothing -std.out_files += $(noinst_LTLIBRARIES) $(lib_LTLIBRARIES) $(notdir $(pkgconfiglib_DATA)) +std.out_files += $(noinst_LTLIBRARIES) $(lib_LTLIBRARIES) $(notdir $(pkgconfiglib_DATA)) $(bin_PROGRAMS) std.sys_files += $(addprefix $(libdir)/,$(lib_LTLIBRARIES)) +std.sys_files += $(addprefix $(bindir)/,$(bin_PROGRAMS)) std.sys_files += $(addprefix $(pkgconfiglibdir)/,$(notdir $(lib_pkgconfiglib_DATA))) $(foreach n,$(call automake_name,$(std.out_files)),\ $(eval $n_SOURCES ?=)\ diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile index 93be30509f..cca337be90 100644 --- a/src/systemd-nspawn/Makefile +++ b/src/systemd-nspawn/Makefile @@ -66,31 +66,16 @@ systemd_nspawn_LDADD += \ libfirewall.la endif +bin_PROGRAMS += systemd-nspawn $(eval $(value automake2autothing)) -std.out_files = systemd-nspawn -CPPFLAGS += $(libbasic.CPPFLAGS) $(libshared.CPPFLAGS) $(libsystemd.CPPFLAGS) $(libudev.CPPFLAGS) $(libblkid.CPPFLAGS) -CPPFLAGS += -I$(topsrcdir)/src/libsystemd/src/sd-netlink -I$(topsrcdir)/src/libsystemd/src/sd-bus -I$(topsrcdir)/src/udev -I$(topsrcdir)/src/libudev/src -CPPFLAGS += $(libblkid.CPPFLAGS) $(libseccomp.CPPFLAGS) -ifneq ($(HAVE_LIBIPTC),) -CPPFLAGS += $(libfirewall.CPPFLAGS) -endif -$(outdir)/systemd-nspawn: \ - $(outdir)/nspawn.o \ - $(outdir)/nspawn-settings.o \ - $(outdir)/nspawn-mount.o \ - $(outdir)/nspawn-network.o \ - $(outdir)/nspawn-expose-ports.o \ - $(outdir)/nspawn-cgroup.o \ - $(outdir)/nspawn-register.o \ - $(outdir)/nspawn-setuid.o \ - $(outdir)/nspawn-stub-pid1.o \ - $(outdir)/mount-setup.o \ - $(outdir)/loopback-setup.o \ - $(libshared.DEPENDS) $(libblkid.DEPENDS) -ifneq ($(HAVE_LIBIPTC),) -$(outdir)/systemd-nspawn: $(libfirewall.DEPENDS) -endif -$(outdir)/nspawn.o: $(outdir)/loopback-setup.h +CPPFLAGS += $(libbasic.CPPFLAGS) +CPPFLAGS += $(libshared.CPPFLAGS) +CPPFLAGS += $(libsystemd.CPPFLAGS) +CPPFLAGS += $(libudev.CPPFLAGS) +CPPFLAGS += -I$(topsrcdir)/src/libsystemd/src/sd-netlink +CPPFLAGS += -I$(topsrcdir)/src/libsystemd/src/sd-bus +CPPFLAGS += -I$(topsrcdir)/src +CPPFLAGS += /udev -I$(topsrcdir)/src/libudev/src include $(topsrcdir)/build-aux/Makefile.tail.mk |