summaryrefslogtreecommitdiff
path: root/src/grp-machine
diff options
context:
space:
mode:
Diffstat (limited to 'src/grp-machine')
-rw-r--r--src/grp-machine/grp-import/libimport/Makefile9
-rw-r--r--src/grp-machine/grp-import/libimport/import-common.h2
-rw-r--r--src/grp-machine/grp-import/systemd-export/Makefile7
-rw-r--r--src/grp-machine/grp-import/systemd-import/Makefile9
-rw-r--r--src/grp-machine/grp-import/systemd-importd/Makefile1
-rw-r--r--src/grp-machine/grp-import/systemd-pull/Makefile9
-rw-r--r--src/grp-machine/libmachine-core/src/Makefile1
-rw-r--r--src/grp-machine/libmachine-core/src/machine-dbus.c2
-rw-r--r--src/grp-machine/machinectl/Makefile1
-rw-r--r--src/grp-machine/systemd-machined/Makefile12
10 files changed, 24 insertions, 29 deletions
diff --git a/src/grp-machine/grp-import/libimport/Makefile b/src/grp-machine/grp-import/libimport/Makefile
index 585001b2fa..3e8b6b1401 100644
--- a/src/grp-machine/grp-import/libimport/Makefile
+++ b/src/grp-machine/grp-import/libimport/Makefile
@@ -23,6 +23,15 @@
include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
include $(topsrcdir)/build-aux/Makefile.head.mk
+noinst_LTLIBRARIES += libimport.la
+
+libimport_la_SOURCES = \
+ qcow2-util.c \
+ import-common.c \
+ import-compress.c
+
+libimport_la_LIBADD += libsystemd-basic.la
+
manual_tests += \
test-qcow2
diff --git a/src/grp-machine/grp-import/libimport/import-common.h b/src/grp-machine/grp-import/libimport/import-common.h
index 07d3250e71..3abd62e8c3 100644
--- a/src/grp-machine/grp-import/libimport/import-common.h
+++ b/src/grp-machine/grp-import/libimport/import-common.h
@@ -19,6 +19,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include <sys/types.h>
+
int import_make_read_only_fd(int fd);
int import_make_read_only(const char *path);
diff --git a/src/grp-machine/grp-import/systemd-export/Makefile b/src/grp-machine/grp-import/systemd-export/Makefile
index fa6306226f..f641d93f14 100644
--- a/src/grp-machine/grp-import/systemd-export/Makefile
+++ b/src/grp-machine/grp-import/systemd-export/Makefile
@@ -30,11 +30,7 @@ systemd_export_SOURCES = \
src/import/export-tar.c \
src/import/export-tar.h \
src/import/export-raw.c \
- src/import/export-raw.h \
- src/import/import-common.c \
- src/import/import-common.h \
- src/import/import-compress.c \
- src/import/import-compress.h
+ src/import/export-raw.h
systemd_export_CFLAGS = \
$(XZ_CFLAGS) \
@@ -43,6 +39,7 @@ systemd_export_CFLAGS = \
systemd_export_LDADD = \
libsystemd-shared.la \
+ libimport.la \
$(XZ_LIBS) \
$(ZLIB_LIBS) \
$(BZIP2_LIBS)
diff --git a/src/grp-machine/grp-import/systemd-import/Makefile b/src/grp-machine/grp-import/systemd-import/Makefile
index 8d04ec18c5..51510f4470 100644
--- a/src/grp-machine/grp-import/systemd-import/Makefile
+++ b/src/grp-machine/grp-import/systemd-import/Makefile
@@ -29,13 +29,7 @@ systemd_import_SOURCES = \
src/import/import-raw.c \
src/import/import-raw.h \
src/import/import-tar.c \
- src/import/import-tar.h \
- src/import/import-common.c \
- src/import/import-common.h \
- src/import/import-compress.c \
- src/import/import-compress.h \
- src/import/qcow2-util.c \
- src/import/qcow2-util.h
+ src/import/import-tar.h
systemd_import_CFLAGS = \
$(XZ_CFLAGS) \
@@ -44,6 +38,7 @@ systemd_import_CFLAGS = \
systemd_import_LDADD = \
libsystemd-shared.la \
+ libimport.la \
$(XZ_LIBS) \
$(ZLIB_LIBS) \
$(BZIP2_LIBS)
diff --git a/src/grp-machine/grp-import/systemd-importd/Makefile b/src/grp-machine/grp-import/systemd-importd/Makefile
index f473e34ea3..65537f7601 100644
--- a/src/grp-machine/grp-import/systemd-importd/Makefile
+++ b/src/grp-machine/grp-import/systemd-importd/Makefile
@@ -33,6 +33,7 @@ systemd_importd_CFLAGS = \
-D SYSTEMD_EXPORT_PATH=\"$(rootlibexecdir)/systemd-export\"
systemd_importd_LDADD = \
+ libsystemd-internal.la \
libsystemd-shared.la
nodist_systemunit_DATA += \
diff --git a/src/grp-machine/grp-import/systemd-pull/Makefile b/src/grp-machine/grp-import/systemd-pull/Makefile
index b89d456f37..2254ac651b 100644
--- a/src/grp-machine/grp-import/systemd-pull/Makefile
+++ b/src/grp-machine/grp-import/systemd-pull/Makefile
@@ -34,14 +34,8 @@ systemd_pull_SOURCES = \
src/import/pull-job.h \
src/import/pull-common.c \
src/import/pull-common.h \
- src/import/import-common.c \
- src/import/import-common.h \
- src/import/import-compress.c \
- src/import/import-compress.h \
src/import/curl-util.c \
- src/import/curl-util.h \
- src/import/qcow2-util.c \
- src/import/qcow2-util.h
+ src/import/curl-util.h
systemd_pull_CFLAGS = \
$(LIBCURL_CFLAGS) \
@@ -54,6 +48,7 @@ systemd_pull_CFLAGS = \
systemd_pull_LDADD = \
libsystemd-shared.la \
+ libimport.la \
$(LIBCURL_LIBS) \
$(XZ_LIBS) \
$(ZLIB_LIBS) \
diff --git a/src/grp-machine/libmachine-core/src/Makefile b/src/grp-machine/libmachine-core/src/Makefile
index ac7cdc0e2d..a1e10f3cb4 100644
--- a/src/grp-machine/libmachine-core/src/Makefile
+++ b/src/grp-machine/libmachine-core/src/Makefile
@@ -35,6 +35,7 @@ libmachine_core_la_SOURCES = \
src/machine/operation.h
libmachine_core_la_LIBADD = \
+ libsystemd-internal.la \
libsystemd-shared.la
noinst_LTLIBRARIES += \
diff --git a/src/grp-machine/libmachine-core/src/machine-dbus.c b/src/grp-machine/libmachine-core/src/machine-dbus.c
index b7363054b3..89991a798f 100644
--- a/src/grp-machine/libmachine-core/src/machine-dbus.c
+++ b/src/grp-machine/libmachine-core/src/machine-dbus.c
@@ -33,7 +33,6 @@
#include "sd-bus/bus-common-errors.h"
#include "sd-bus/bus-internal.h"
#include "sd-bus/bus-util.h"
-#include "sd-netlink/local-addresses.h"
#include "systemd-basic/alloc-util.h"
#include "systemd-basic/bus-label.h"
#include "systemd-basic/copy.h"
@@ -50,6 +49,7 @@
#include "systemd-basic/strv.h"
#include "systemd-basic/terminal-util.h"
#include "systemd-basic/user-util.h"
+#include "systemd-shared/local-addresses.h"
static int property_get_state(
sd_bus *bus,
diff --git a/src/grp-machine/machinectl/Makefile b/src/grp-machine/machinectl/Makefile
index f6760f3174..397d4fd4da 100644
--- a/src/grp-machine/machinectl/Makefile
+++ b/src/grp-machine/machinectl/Makefile
@@ -27,6 +27,7 @@ machinectl_SOURCES = \
src/machine/machinectl.c
machinectl_LDADD = \
+ libsystemd-internal.la \
libsystemd-shared.la
rootbin_PROGRAMS += \
diff --git a/src/grp-machine/systemd-machined/Makefile b/src/grp-machine/systemd-machined/Makefile
index 432a792a18..011e740e02 100644
--- a/src/grp-machine/systemd-machined/Makefile
+++ b/src/grp-machine/systemd-machined/Makefile
@@ -28,6 +28,9 @@ systemd_machined_SOURCES = \
src/machine/machined.h
systemd_machined_LDADD = \
+ libsystemd-internal.la \
+ libsystemd-shared.la \
+ libsystemd-basic.la \
libmachine-core.la
rootlibexec_PROGRAMS += \
@@ -63,13 +66,4 @@ polkitpolicy_in_files += \
EXTRA_DIST += \
units/systemd-machined.service.in
-# ------------------------------------------------------------------------------
-ifneq ($(ENABLE_IMPORTD),)
-
-ifneq ($(HAVE_LIBCURL),)
-ifneq ($(HAVE_XZ),)
-ifneq ($(HAVE_ZLIB),)
-ifneq ($(HAVE_BZIP2),)
-ifneq ($(HAVE_GCRYPT),)
-
include $(topsrcdir)/build-aux/Makefile.tail.mk
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-04 08:46:43 +0000