diff options
Diffstat (limited to 'src/grp-machine')
| -rw-r--r-- | src/grp-machine/grp-import/Makefile | 16 | ||||
| -rw-r--r-- | src/grp-machine/systemd-machined/Makefile | 34 |
2 files changed, 17 insertions, 33 deletions
diff --git a/src/grp-machine/grp-import/Makefile b/src/grp-machine/grp-import/Makefile index 5cda3c9a9f..dfa189b317 100644 --- a/src/grp-machine/grp-import/Makefile +++ b/src/grp-machine/grp-import/Makefile @@ -23,22 +23,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -ifneq ($(ENABLE_IMPORTD),) - -ifneq ($(HAVE_LIBCURL),) -ifneq ($(HAVE_XZ),) -ifneq ($(HAVE_ZLIB),) -ifneq ($(HAVE_BZIP2),) -ifneq ($(HAVE_GCRYPT),) - -endif # HAVE_GCRYPT -endif # HAVE_BZIP2 -endif # HAVE_ZLIB -endif # HAVE_XZ -endif # HAVE_LIBCURL - -endif # ENABLE_IMPORTD - nested.subdirs += libimport nested.subdirs += systemd-export nested.subdirs += systemd-import diff --git a/src/grp-machine/systemd-machined/Makefile b/src/grp-machine/systemd-machined/Makefile index 52016c3b5d..66ac0b9275 100644 --- a/src/grp-machine/systemd-machined/Makefile +++ b/src/grp-machine/systemd-machined/Makefile @@ -23,6 +23,19 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk +systemd_machined_SOURCES = \ + $(_libmachine_core_la_SOURCES) \ + src/machine/machined.c \ + src/machine/machined.h + +systemd_machined_LDADD = \ + libsystemd-internal.la \ + libshared.la \ + libbasic.la + +rootlibexec_PROGRAMS += \ + systemd-machined + _libmachine_core_la_SOURCES = \ src/machine/machine.c \ src/machine/machine.h \ @@ -34,18 +47,12 @@ _libmachine_core_la_SOURCES = \ src/machine/operation.c \ src/machine/operation.h -systemd_machined_SOURCES = \ +test_machine_tables_SOURCES = \ $(_libmachine_core_la_SOURCES) \ - src/machine/machined.c \ - src/machine/machined.h - -systemd_machined_LDADD = \ - libsystemd-internal.la \ - libshared.la \ - libbasic.la + src/machine/test-machine-tables.c -rootlibexec_PROGRAMS += \ - systemd-machined +tests += \ + test-machine-tables nodist_systemunit_DATA += \ units/systemd-machined.service @@ -77,11 +84,4 @@ polkitpolicy_in_files += \ EXTRA_DIST += \ units/systemd-machined.service.in -test_machine_tables_SOURCES = \ - $(_libmachine_core_la_SOURCES) \ - src/machine/test-machine-tables.c - -tests += \ - test-machine-tables - include $(topsrcdir)/build-aux/Makefile.tail.mk |