summaryrefslogtreecommitdiff
path: root/src/grp-machine
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-09-12 18:11:31 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-09-12 18:11:31 -0400
commit8551be2becc2ae384037fd92427bd6f1527e1039 (patch)
tree5ddd96690f4483ff5e34e519112d1272f16f740b /src/grp-machine
parent6613132ae4a8e1232760949f39f32003ba857bd9 (diff)
./tools/notsd-fixup **/Makefile
Diffstat (limited to 'src/grp-machine')
-rw-r--r--src/grp-machine/Makefile5
-rw-r--r--src/grp-machine/grp-import/Makefile12
-rw-r--r--src/grp-machine/nss-mymachines/Makefile1
-rw-r--r--src/grp-machine/systemd-machined/Makefile1
4 files changed, 9 insertions, 10 deletions
diff --git a/src/grp-machine/Makefile b/src/grp-machine/Makefile
index c5225e44b5..9679410b7b 100644
--- a/src/grp-machine/Makefile
+++ b/src/grp-machine/Makefile
@@ -23,8 +23,9 @@
include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
include $(topsrcdir)/build-aux/Makefile.head.mk
-nested.subdirs += machinectl systemd-machined
-nested.subdirs += nss-mymachines
nested.subdirs += grp-import
+nested.subdirs += machinectl
+nested.subdirs += nss-mymachines
+nested.subdirs += systemd-machined
include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-machine/grp-import/Makefile b/src/grp-machine/grp-import/Makefile
index b996bd4c19..5cda3c9a9f 100644
--- a/src/grp-machine/grp-import/Makefile
+++ b/src/grp-machine/grp-import/Makefile
@@ -31,12 +31,6 @@ ifneq ($(HAVE_ZLIB),)
ifneq ($(HAVE_BZIP2),)
ifneq ($(HAVE_GCRYPT),)
-nested.subdirs += libimport
-nested.subdirs += systemd-export
-nested.subdirs += systemd-import
-nested.subdirs += systemd-importd
-nested.subdirs += systemd-pull
-
endif # HAVE_GCRYPT
endif # HAVE_BZIP2
endif # HAVE_ZLIB
@@ -45,4 +39,10 @@ endif # HAVE_LIBCURL
endif # ENABLE_IMPORTD
+nested.subdirs += libimport
+nested.subdirs += systemd-export
+nested.subdirs += systemd-import
+nested.subdirs += systemd-importd
+nested.subdirs += systemd-pull
+
include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-machine/nss-mymachines/Makefile b/src/grp-machine/nss-mymachines/Makefile
index c7c0d76907..78cb6419c0 100644
--- a/src/grp-machine/nss-mymachines/Makefile
+++ b/src/grp-machine/nss-mymachines/Makefile
@@ -23,7 +23,6 @@
include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
include $(topsrcdir)/build-aux/Makefile.head.mk
-
libnss_mymachines_la_SOURCES = \
src/nss-mymachines/nss-mymachines.sym \
src/nss-mymachines/nss-mymachines.c
diff --git a/src/grp-machine/systemd-machined/Makefile b/src/grp-machine/systemd-machined/Makefile
index 182b52edd2..52016c3b5d 100644
--- a/src/grp-machine/systemd-machined/Makefile
+++ b/src/grp-machine/systemd-machined/Makefile
@@ -71,7 +71,6 @@ SYSTEM_UNIT_ALIASES += \
BUSNAMES_TARGET_WANTS += \
org.freedesktop.machine1.busname
-
polkitpolicy_in_files += \
src/machine/org.freedesktop.machine1.policy.in