From 9c9b5ae7cf7d79c83a62d6842f50b6b8a1ae1183 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 4 Jun 2016 17:06:17 -0400 Subject: stuff --- src/systemd-nspawn/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/systemd-nspawn/Makefile') diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile index cca337be90..49de89d302 100644 --- a/src/systemd-nspawn/Makefile +++ b/src/systemd-nspawn/Makefile @@ -58,24 +58,24 @@ systemd_nspawn_CFLAGS = \ $(SECCOMP_CFLAGS) systemd_nspawn_LDADD = \ - libshared.la \ + $(topoutdir)/libshared/libshared.la \ $(BLKID_LIBS) ifneq ($(HAVE_LIBIPTC),) systemd_nspawn_LDADD += \ - libfirewall.la + $(topoutdir)/libfirewall/libfirewall.la endif bin_PROGRAMS += systemd-nspawn $(eval $(value automake2autothing)) - +at.depdirs += $(topoutdir)/src/libshared $(if $(HAVE_LIBIPTC),$(topoutdir)/src/libfirewall) 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 +CPPFLAGS += $(libfirewall.CPPFLAGS) +CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-netlink +CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus +CPPFLAGS += -I$(topsrcdir)/src/udev +CPPFLAGS += -I$(topsrcdir)/src/libudev/src include $(topsrcdir)/build-aux/Makefile.tail.mk -- cgit v1.2.3-54-g00ecf