diff options
Diffstat (limited to 'src')
26 files changed, 86 insertions, 43 deletions
diff --git a/src/libbasic/Makefile b/src/libbasic/Makefile index a5884de6e1..66941a468f 100644 --- a/src/libbasic/Makefile +++ b/src/libbasic/Makefile @@ -219,27 +219,19 @@ libbasic_la_SOURCES = \ src/basic/formats-util.h \ src/basic/nss-util.h -nodist_libbasic_la_SOURCES = \ - src/basic/errno-from-name.h \ - src/basic/errno-to-name.h \ - src/basic/af-from-name.h \ - src/basic/af-to-name.h \ - src/basic/arphrd-from-name.h \ - src/basic/arphrd-to-name.h \ - src/basic/cap-from-name.h \ - src/basic/cap-to-name.h +std.out_files = libbasic.la +CFLAGS += -pthread +CPPFLAGS += $(libsystemd.CPPFLAGS) $(libselinux.CPPFLAGS) $(libcap.CPPFLAGS) +$(outdir)/libbasic.la: \ + $(patsubst src/basic/%.c,$(outdir)/%.lo,$(filter %.c,$(libbasic_la_SOURCES))) \ + $(libselinux.DEPENDS) $(libcap.DEPENDS) -lrt -lm -libbasic_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(SELINUX_CFLAGS) \ - $(CAP_CFLAGS) \ - -pthread +std.gen_files += *-to-name.h *-from-name.h *-from-name.gperf *-list.txt -libbasic_la_LIBADD = \ - $(SELINUX_LIBS) \ - $(CAP_LIBS) \ - -lrt \ - -lm +$(outdir)/af-list.lo: $(outdir)/af-from-name.h $(outdir)/af-to-name.h +$(outdir)/arphrd-list.lo: $(outdir)/arphrd-from-name.h $(outdir)/arphrd-to-name.h +$(outdir)/cap-list.lo: $(outdir)/cap-from-name.h $(outdir)/cap-to-name.h +$(outdir)/errno-list.lo: $(outdir)/errno-from-name.h $(outdir)/errno-to-name.h $(outdir)/errno-list.txt: $(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@ diff --git a/src/libfirewall/Makefile b/src/libfirewall/Makefile index 875d03a879..aeeb191c33 100644 --- a/src/libfirewall/Makefile +++ b/src/libfirewall/Makefile @@ -27,16 +27,10 @@ ifneq ($(HAVE_LIBIPTC),) noinst_LTLIBRARIES += \ libfirewall.la -libfirewall_la_SOURCES = \ - src/shared/firewall-util.h \ - src/shared/firewall-util.c +std.out_files = libfirewall.la +CPPFLAGS += $(libbasic.CPPFLAGS) $(libiptc.CPPFLAGS) +$(outdir)/libfirewall.la: $(outdir)/firewall-util.lo $(libiptc.DEPENDS) -libfirewall_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(LIBIPTC_CFLAGS) - -libfirewall_la_LIBADD = \ - $(LIBIPTC_LIBS) endif include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libshared/Makefile b/src/libshared/Makefile index d0141969b3..3c260f5ae6 100644 --- a/src/libshared/Makefile +++ b/src/libshared/Makefile @@ -137,4 +137,16 @@ libshared_la_LIBADD = \ $(LIBIDN_LIBS) \ $(SECCOMP_LIBS) +std.out_files += libshared.la +CPPFLAGS += -I$(topsrcdir)/src/libsystemd/include +CPPFLAGS += -I$(topoutdir)/src/libsystemd/include +CPPFLAGS += -I$(topsrcdir)/src/libbasic +CPPFLAGS += -I$(topoutdir)/src/libbasic +CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" +CPPFLAGS += -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \ +$(outdir)/libshared.la: \ + $(patsubst src/shared/%.c,$(outdir)/%.lo,$(filter %.c,$(libshared_la_SOURCES))) + +$(call amtarget2dir,src/shared,libshared.la) + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile index 79cfae8f47..50de17357f 100644 --- a/src/libsystemd/Makefile +++ b/src/libsystemd/Makefile @@ -94,6 +94,8 @@ pkginclude_HEADERS += \ lib_LTLIBRARIES += \ libsystemd.la +# ------------------------------------------------------------------------------ + tests += \ test-bus-marshal \ test-bus-signature \ diff --git a/src/libsystemd/libsystemd-internal/Makefile b/src/libsystemd/libsystemd-internal/Makefile index 079d9c4745..c85835a94d 100644 --- a/src/libsystemd/libsystemd-internal/Makefile +++ b/src/libsystemd/libsystemd-internal/Makefile @@ -20,7 +20,7 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. -include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk libsystemd_internal_la_SOURCES = \ @@ -120,4 +120,12 @@ libsystemd_internal_la_LIBADD = \ noinst_LTLIBRARIES += \ libsystemd-internal.la +std.out_files += libsystemd-internal.la +CPPFLAGS += $(libsystemd.CPPFLAGS) $(libbasic.CPPFLAGS) $(libshared.CPPFLAGS) +CPPFLAGS += -DLIBDIR=\"$(libdir)\" -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" +am.subdirs += $(dir $(patsubst src/libsystemd/%.c,$(outdir)/%.lo,$(filter %.c,$(libsystemd_internal_la_SOURCES)))) +$(outdir)/libsystemd-internal.la: \ + $(patsubst src/libsystemd/%.c,$(outdir)/%.lo,$(filter %.c,$(libsystemd_internal_la_SOURCES))) \ + $(libbasic.DEPENDS) -lresolv + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/libsystemd-internal/sd-bus/Makefile b/src/libsystemd/libsystemd-internal/sd-bus/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/sd-bus/Makefile @@ -0,0 +1 @@ +../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/libsystemd-internal/sd-daemon/Makefile b/src/libsystemd/libsystemd-internal/sd-daemon/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/sd-daemon/Makefile @@ -0,0 +1 @@ +../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/libsystemd-internal/sd-device/Makefile b/src/libsystemd/libsystemd-internal/sd-device/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/sd-device/Makefile @@ -0,0 +1 @@ +../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/libsystemd-internal/sd-event/Makefile b/src/libsystemd/libsystemd-internal/sd-event/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/sd-event/Makefile @@ -0,0 +1 @@ +../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/libsystemd-internal/sd-hwdb/Makefile b/src/libsystemd/libsystemd-internal/sd-hwdb/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/sd-hwdb/Makefile @@ -0,0 +1 @@ +../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/libsystemd-internal/sd-id128/Makefile b/src/libsystemd/libsystemd-internal/sd-id128/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/sd-id128/Makefile @@ -0,0 +1 @@ +../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/libsystemd-internal/sd-login/Makefile b/src/libsystemd/libsystemd-internal/sd-login/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/sd-login/Makefile @@ -0,0 +1 @@ +../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/libsystemd-internal/sd-netlink/Makefile b/src/libsystemd/libsystemd-internal/sd-netlink/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/sd-netlink/Makefile @@ -0,0 +1 @@ +../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/libsystemd-internal/sd-network/Makefile b/src/libsystemd/libsystemd-internal/sd-network/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/sd-network/Makefile @@ -0,0 +1 @@ +../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/libsystemd-internal/sd-path/Makefile b/src/libsystemd/libsystemd-internal/sd-path/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/sd-path/Makefile @@ -0,0 +1 @@ +../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/libsystemd-internal/sd-resolve/Makefile b/src/libsystemd/libsystemd-internal/sd-resolve/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/sd-resolve/Makefile @@ -0,0 +1 @@ +../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/libsystemd-internal/sd-utf8/Makefile b/src/libsystemd/libsystemd-internal/sd-utf8/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/sd-utf8/Makefile @@ -0,0 +1 @@ +../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/libsystemd-internal/subdir.mk b/src/libsystemd/libsystemd-internal/subdir.mk new file mode 100644 index 0000000000..69eb85a4d7 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/subdir.mk @@ -0,0 +1,7 @@ +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk +include $(topsrcdir)/automake.head.mk + +#CPPFLAGS += $(libsystemd.CPPFLAGS) $(libbasic.CPPFLAGS) $(libshared.CPPFLAGS) +#CPPFLAGS += -DLIBDIR=\"$(libdir)\" -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" + +include $(topsrcdir)/automake.tail.mk diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile index 742d8ad82e..3455305df8 100644 --- a/src/systemd-nspawn/Makefile +++ b/src/systemd-nspawn/Makefile @@ -52,18 +52,30 @@ nodist_systemd_nspawn_SOURCES = \ gperf_gperf_sources += \ src/nspawn/nspawn-gperf.gperf -systemd_nspawn_CFLAGS = \ - $(AM_CFLAGS) \ - $(BLKID_CFLAGS) \ - $(SECCOMP_CFLAGS) - -systemd_nspawn_LDADD = \ - libshared.la \ - $(BLKID_LIBS) - +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),) -systemd_nspawn_LDADD += \ - libfirewall.la +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 include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-nspawn/loopback-setup.c b/src/systemd-nspawn/loopback-setup.c new file mode 120000 index 0000000000..1078ace0bf --- /dev/null +++ b/src/systemd-nspawn/loopback-setup.c @@ -0,0 +1 @@ +../libcore/loopback-setup.c
\ No newline at end of file diff --git a/src/systemd-nspawn/loopback-setup.h b/src/systemd-nspawn/loopback-setup.h new file mode 120000 index 0000000000..18fc7663a2 --- /dev/null +++ b/src/systemd-nspawn/loopback-setup.h @@ -0,0 +1 @@ +../libcore/loopback-setup.h
\ No newline at end of file diff --git a/src/systemd-nspawn/mount-setup.c b/src/systemd-nspawn/mount-setup.c new file mode 120000 index 0000000000..a4ab487157 --- /dev/null +++ b/src/systemd-nspawn/mount-setup.c @@ -0,0 +1 @@ +../libcore/mount-setup.c
\ No newline at end of file diff --git a/src/systemd-nspawn/mount-setup.h b/src/systemd-nspawn/mount-setup.h new file mode 120000 index 0000000000..1f984851f8 --- /dev/null +++ b/src/systemd-nspawn/mount-setup.h @@ -0,0 +1 @@ +../libcore/mount-setup.h
\ No newline at end of file diff --git a/src/systemd-nspawn/nspawn-expose-ports.c b/src/systemd-nspawn/nspawn-expose-ports.c index 8122a14f7b..d82e495fa8 100644 --- a/src/systemd-nspawn/nspawn-expose-ports.c +++ b/src/systemd-nspawn/nspawn-expose-ports.c @@ -21,7 +21,7 @@ #include "alloc-util.h" #include "fd-util.h" -#include "firewall-util.h" +#include <firewall-util.h> #include "in-addr-util.h" #include "local-addresses.h" #include "netlink-util.h" diff --git a/src/systemd-nspawn/nspawn-network.c b/src/systemd-nspawn/nspawn-network.c index d03fd001a7..769f865195 100644 --- a/src/systemd-nspawn/nspawn-network.c +++ b/src/systemd-nspawn/nspawn-network.c @@ -20,7 +20,7 @@ #include <linux/veth.h> #include <net/if.h> -#include "libudev.h" +#include <libudev.h> #include <systemd/sd-id128.h> #include <systemd/sd-netlink.h> diff --git a/src/udev/udev.h b/src/udev/udev.h index 91dfc950b4..3aace1532f 100644 --- a/src/udev/udev.h +++ b/src/udev/udev.h @@ -21,7 +21,7 @@ #include <sys/param.h> #include <sys/types.h> -#include "libudev.h" +#include <libudev.h> #include <systemd/sd-netlink.h> #include "label.h" |