summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/busctl/Makefile136
-rw-r--r--src/grp-boot/systemd-boot/Makefile61
-rw-r--r--src/libbus-proxy-core/Makefile43
-rw-r--r--src/libbus-proxy-core/bus-xml-policy.c (renamed from src/bus-proxyd/bus-xml-policy.c)0
-rw-r--r--src/libbus-proxy-core/bus-xml-policy.h (renamed from src/bus-proxyd/bus-xml-policy.h)0
-rw-r--r--src/libbus-proxy-core/driver.c (renamed from src/bus-proxyd/driver.c)0
-rw-r--r--src/libbus-proxy-core/driver.h (renamed from src/bus-proxyd/driver.h)0
-rw-r--r--src/libbus-proxy-core/proxy.c (renamed from src/bus-proxyd/proxy.c)0
-rw-r--r--src/libbus-proxy-core/proxy.h (renamed from src/bus-proxyd/proxy.h)0
-rw-r--r--src/libbus-proxy-core/synthesize.c (renamed from src/bus-proxyd/synthesize.c)0
-rw-r--r--src/libbus-proxy-core/synthesize.h (renamed from src/bus-proxyd/synthesize.h)0
-rw-r--r--src/libbus-proxy-core/test-bus-xml-policy.c (renamed from src/bus-proxyd/test-bus-xml-policy.c)0
-rw-r--r--src/libsystemd/libsystemd-internal/Makefile136
-rw-r--r--src/systemd-bus-proxyd/Makefile (renamed from src/bus-proxyd/Makefile)23
-rw-r--r--src/systemd-bus-proxyd/bus-proxyd.c (renamed from src/bus-proxyd/bus-proxyd.c)0
-rw-r--r--src/systemd-stdio-bridge/Makefile34
-rw-r--r--src/systemd-stdio-bridge/stdio-bridge.c (renamed from src/bus-proxyd/stdio-bridge.c)0
17 files changed, 274 insertions, 159 deletions
diff --git a/src/busctl/Makefile b/src/busctl/Makefile
index d7221f9dcd..261486555d 100644
--- a/src/busctl/Makefile
+++ b/src/busctl/Makefile
@@ -26,142 +26,6 @@ include $(topsrcdir)/build-aux/Makefile.head.mk
bin_PROGRAMS += \
busctl
-test_bus_marshal_SOURCES = \
- src/libsystemd/sd-bus/test-bus-marshal.c
-
-test_bus_marshal_LDADD = \
- libshared.la \
- $(GLIB_LIBS) \
- $(DBUS_LIBS)
-
-test_bus_marshal_CFLAGS = \
- $(AM_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS)
-
-test_bus_signature_SOURCES = \
- src/libsystemd/sd-bus/test-bus-signature.c
-
-test_bus_signature_LDADD = \
- libshared.la
-
-test_bus_chat_SOURCES = \
- src/libsystemd/sd-bus/test-bus-chat.c
-
-test_bus_chat_LDADD = \
- libshared.la
-
-test_bus_cleanup_SOURCES = \
- src/libsystemd/sd-bus/test-bus-cleanup.c
-
-test_bus_cleanup_CFLAGS = \
- $(AM_CFLAGS) \
- $(SECCOMP_CFLAGS)
-
-test_bus_cleanup_LDADD = \
- libshared.la
-
-test_bus_server_SOURCES = \
- src/libsystemd/sd-bus/test-bus-server.c
-
-test_bus_server_LDADD = \
- libshared.la
-
-test_bus_objects_SOURCES = \
- src/libsystemd/sd-bus/test-bus-objects.c
-
-test_bus_objects_LDADD = \
- libshared.la
-
-test_bus_error_SOURCES = \
- src/libsystemd/sd-bus/test-bus-error.c
-
-test_bus_error_LDADD = \
- libshared.la
-
-test_bus_gvariant_SOURCES = \
- src/libsystemd/sd-bus/test-bus-gvariant.c
-
-test_bus_gvariant_LDADD = \
- libshared.la \
- $(GLIB_LIBS)
-
-test_bus_gvariant_CFLAGS = \
- $(AM_CFLAGS) \
- $(GLIB_CFLAGS)
-
-test_bus_creds_SOURCES = \
- src/libsystemd/sd-bus/test-bus-creds.c
-
-test_bus_creds_LDADD = \
- libshared.la
-
-test_bus_match_SOURCES = \
- src/libsystemd/sd-bus/test-bus-match.c
-
-test_bus_match_LDADD = \
- libshared.la
-
-test_bus_proxy_SOURCES = \
- src/libsystemd/sd-bus/test-bus-proxy.c
-
-test_bus_proxy_LDADD = \
- libshared.la
-
-test_bus_kernel_SOURCES = \
- src/libsystemd/sd-bus/test-bus-kernel.c
-
-test_bus_kernel_LDADD = \
- libshared.la
-
-test_bus_kernel_bloom_SOURCES = \
- src/libsystemd/sd-bus/test-bus-kernel-bloom.c
-
-test_bus_kernel_bloom_LDADD = \
- libshared.la
-
-test_bus_benchmark_SOURCES = \
- src/libsystemd/sd-bus/test-bus-benchmark.c
-
-test_bus_benchmark_LDADD = \
- libshared.la
-
-test_bus_zero_copy_SOURCES = \
- src/libsystemd/sd-bus/test-bus-zero-copy.c
-
-test_bus_zero_copy_LDADD = \
- libshared.la
-
-test_bus_introspect_SOURCES = \
- src/libsystemd/sd-bus/test-bus-introspect.c
-
-test_bus_introspect_LDADD = \
- libshared.la
-
-test_event_SOURCES = \
- src/libsystemd/sd-event/test-event.c
-
-test_event_LDADD = \
- libshared.la
-
-test_netlink_SOURCES = \
- src/libsystemd/sd-netlink/test-netlink.c
-
-test_netlink_LDADD = \
- libshared.la
-
-test_local_addresses_SOURCES = \
- src/libsystemd/sd-netlink/test-local-addresses.c
-
-test_local_addresses_LDADD = \
- libshared.la
-
-test_resolve_SOURCES = \
- src/libsystemd/sd-resolve/test-resolve.c
-
-test_resolve_LDADD = \
- libshared.la
-
busctl_SOURCES = \
src/libsystemd/sd-bus/busctl.c \
src/libsystemd/sd-bus/busctl-introspect.c \
diff --git a/src/grp-boot/systemd-boot/Makefile b/src/grp-boot/systemd-boot/Makefile
index 182a272054..afa32f02fd 100644
--- a/src/grp-boot/systemd-boot/Makefile
+++ b/src/grp-boot/systemd-boot/Makefile
@@ -23,6 +23,67 @@
include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
include $(topsrcdir)/build-aux/Makefile.head.mk
+ifneq ($(HAVE_GNUEFI),)
+efi_cppflags = \
+ $(EFI_CPPFLAGS) \
+ -I$(top_builddir) -include config.h \
+ -I$(EFI_INC_DIR)/efi \
+ -I$(EFI_INC_DIR)/efi/$(EFI_ARCH) \
+ -DEFI_MACHINE_TYPE_NAME=\"$(EFI_MACHINE_TYPE_NAME)\"
+
+efi_cflags = \
+ $(EFI_CFLAGS) \
+ -Wall \
+ -Wextra \
+ -std=gnu90 \
+ -nostdinc \
+ -ggdb -O0 \
+ -fpic \
+ -fshort-wchar \
+ -nostdinc \
+ -ffreestanding \
+ -fno-strict-aliasing \
+ -fno-stack-protector \
+ -Wsign-compare \
+ -Wno-missing-field-initializers
+
+ifneq ($(ARCH_X86_64),)
+efi_cflags += \
+ -mno-red-zone \
+ -mno-sse \
+ -mno-mmx \
+ -DEFI_FUNCTION_WRAPPER \
+ -DGNU_EFI_USE_MS_ABI
+endif
+
+ifneq ($(ARCH_IA32),)
+efi_cflags += \
+ -mno-sse \
+ -mno-mmx
+endif
+
+efi_ldflags = \
+ $(EFI_LDFLAGS) \
+ -T $(EFI_LDS_DIR)/elf_$(EFI_ARCH)_efi.lds \
+ -shared \
+ -Bsymbolic \
+ -nostdlib \
+ -znocombreloc \
+ -L $(EFI_LIB_DIR) \
+ $(EFI_LDS_DIR)/crt0-efi-$(EFI_ARCH).o
+
+# Aarch64 and ARM32 don't have an EFI capable objcopy. Use 'binary' instead,
+# and add required symbols manually.
+ifneq ($(ARCH_AARCH64),)
+efi_ldflags += --defsym=EFI_SUBSYSTEM=0xa
+EFI_FORMAT = -O binary
+else
+EFI_FORMAT = --target=efi-app-$(EFI_ARCH)
+endif
+endif
+endif
+
+# ------------------------------------------------------------------------------
systemd_boot_headers = \
src/boot/efi/util.h \
src/boot/efi/console.h \
diff --git a/src/libbus-proxy-core/Makefile b/src/libbus-proxy-core/Makefile
new file mode 100644
index 0000000000..3ac995f31c
--- /dev/null
+++ b/src/libbus-proxy-core/Makefile
@@ -0,0 +1,43 @@
+# -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+# This file is part of systemd.
+#
+# Copyright 2010-2012 Lennart Poettering
+# Copyright 2010-2012 Kay Sievers
+# Copyright 2013 Zbigniew Jędrzejewski-Szmek
+# Copyright 2013 David Strauss
+# Copyright 2016 Luke Shumaker
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# 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 $(topsrcdir)/build-aux/Makefile.head.mk
+
+noinst_LTLIBRARIES += \
+ libbus-proxy-core.la
+
+libbus_proxy_core_la_SOURCES = \
+ src/bus-proxyd/bus-xml-policy.c \
+ src/bus-proxyd/bus-xml-policy.h \
+ src/bus-proxyd/driver.c \
+ src/bus-proxyd/driver.h \
+ src/bus-proxyd/proxy.c \
+ src/bus-proxyd/proxy.h \
+ src/bus-proxyd/synthesize.c \
+ src/bus-proxyd/synthesize.h
+
+libbus_proxy_core_la_LIBADD = \
+ libshared.la
+
+$(eval $(value automake2autothing))
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/bus-proxyd/bus-xml-policy.c b/src/libbus-proxy-core/bus-xml-policy.c
index 86a8362142..86a8362142 100644
--- a/src/bus-proxyd/bus-xml-policy.c
+++ b/src/libbus-proxy-core/bus-xml-policy.c
diff --git a/src/bus-proxyd/bus-xml-policy.h b/src/libbus-proxy-core/bus-xml-policy.h
index 3dcddaa048..3dcddaa048 100644
--- a/src/bus-proxyd/bus-xml-policy.h
+++ b/src/libbus-proxy-core/bus-xml-policy.h
diff --git a/src/bus-proxyd/driver.c b/src/libbus-proxy-core/driver.c
index 133b2e0f39..133b2e0f39 100644
--- a/src/bus-proxyd/driver.c
+++ b/src/libbus-proxy-core/driver.c
diff --git a/src/bus-proxyd/driver.h b/src/libbus-proxy-core/driver.h
index cad7aa7851..cad7aa7851 100644
--- a/src/bus-proxyd/driver.h
+++ b/src/libbus-proxy-core/driver.h
diff --git a/src/bus-proxyd/proxy.c b/src/libbus-proxy-core/proxy.c
index bcfbab0dad..bcfbab0dad 100644
--- a/src/bus-proxyd/proxy.c
+++ b/src/libbus-proxy-core/proxy.c
diff --git a/src/bus-proxyd/proxy.h b/src/libbus-proxy-core/proxy.h
index 0e3ed8a87a..0e3ed8a87a 100644
--- a/src/bus-proxyd/proxy.h
+++ b/src/libbus-proxy-core/proxy.h
diff --git a/src/bus-proxyd/synthesize.c b/src/libbus-proxy-core/synthesize.c
index 7562f29ecb..7562f29ecb 100644
--- a/src/bus-proxyd/synthesize.c
+++ b/src/libbus-proxy-core/synthesize.c
diff --git a/src/bus-proxyd/synthesize.h b/src/libbus-proxy-core/synthesize.h
index cb8c21cdb7..cb8c21cdb7 100644
--- a/src/bus-proxyd/synthesize.h
+++ b/src/libbus-proxy-core/synthesize.h
diff --git a/src/bus-proxyd/test-bus-xml-policy.c b/src/libbus-proxy-core/test-bus-xml-policy.c
index 6f32c09789..6f32c09789 100644
--- a/src/bus-proxyd/test-bus-xml-policy.c
+++ b/src/libbus-proxy-core/test-bus-xml-policy.c
diff --git a/src/libsystemd/libsystemd-internal/Makefile b/src/libsystemd/libsystemd-internal/Makefile
index 5bb37fcd4b..4bd6b8c355 100644
--- a/src/libsystemd/libsystemd-internal/Makefile
+++ b/src/libsystemd/libsystemd-internal/Makefile
@@ -120,6 +120,142 @@ libsystemd_internal_la_LIBADD = \
noinst_LTLIBRARIES += \
libsystemd-internal.la
+test_bus_marshal_SOURCES = \
+ src/libsystemd/sd-bus/test-bus-marshal.c
+
+test_bus_marshal_LDADD = \
+ libshared.la \
+ $(GLIB_LIBS) \
+ $(DBUS_LIBS)
+
+test_bus_marshal_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(DBUS_CFLAGS)
+
+test_bus_signature_SOURCES = \
+ src/libsystemd/sd-bus/test-bus-signature.c
+
+test_bus_signature_LDADD = \
+ libshared.la
+
+test_bus_chat_SOURCES = \
+ src/libsystemd/sd-bus/test-bus-chat.c
+
+test_bus_chat_LDADD = \
+ libshared.la
+
+test_bus_cleanup_SOURCES = \
+ src/libsystemd/sd-bus/test-bus-cleanup.c
+
+test_bus_cleanup_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SECCOMP_CFLAGS)
+
+test_bus_cleanup_LDADD = \
+ libshared.la
+
+test_bus_server_SOURCES = \
+ src/libsystemd/sd-bus/test-bus-server.c
+
+test_bus_server_LDADD = \
+ libshared.la
+
+test_bus_objects_SOURCES = \
+ src/libsystemd/sd-bus/test-bus-objects.c
+
+test_bus_objects_LDADD = \
+ libshared.la
+
+test_bus_error_SOURCES = \
+ src/libsystemd/sd-bus/test-bus-error.c
+
+test_bus_error_LDADD = \
+ libshared.la
+
+test_bus_gvariant_SOURCES = \
+ src/libsystemd/sd-bus/test-bus-gvariant.c
+
+test_bus_gvariant_LDADD = \
+ libshared.la \
+ $(GLIB_LIBS)
+
+test_bus_gvariant_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(GLIB_CFLAGS)
+
+test_bus_creds_SOURCES = \
+ src/libsystemd/sd-bus/test-bus-creds.c
+
+test_bus_creds_LDADD = \
+ libshared.la
+
+test_bus_match_SOURCES = \
+ src/libsystemd/sd-bus/test-bus-match.c
+
+test_bus_match_LDADD = \
+ libshared.la
+
+test_bus_proxy_SOURCES = \
+ src/libsystemd/sd-bus/test-bus-proxy.c
+
+test_bus_proxy_LDADD = \
+ libshared.la
+
+test_bus_kernel_SOURCES = \
+ src/libsystemd/sd-bus/test-bus-kernel.c
+
+test_bus_kernel_LDADD = \
+ libshared.la
+
+test_bus_kernel_bloom_SOURCES = \
+ src/libsystemd/sd-bus/test-bus-kernel-bloom.c
+
+test_bus_kernel_bloom_LDADD = \
+ libshared.la
+
+test_bus_benchmark_SOURCES = \
+ src/libsystemd/sd-bus/test-bus-benchmark.c
+
+test_bus_benchmark_LDADD = \
+ libshared.la
+
+test_bus_zero_copy_SOURCES = \
+ src/libsystemd/sd-bus/test-bus-zero-copy.c
+
+test_bus_zero_copy_LDADD = \
+ libshared.la
+
+test_bus_introspect_SOURCES = \
+ src/libsystemd/sd-bus/test-bus-introspect.c
+
+test_bus_introspect_LDADD = \
+ libshared.la
+
+test_event_SOURCES = \
+ src/libsystemd/sd-event/test-event.c
+
+test_event_LDADD = \
+ libshared.la
+
+test_netlink_SOURCES = \
+ src/libsystemd/sd-netlink/test-netlink.c
+
+test_netlink_LDADD = \
+ libshared.la
+
+test_local_addresses_SOURCES = \
+ src/libsystemd/sd-netlink/test-local-addresses.c
+
+test_local_addresses_LDADD = \
+ libshared.la
+
+test_resolve_SOURCES = \
+ src/libsystemd/sd-resolve/test-resolve.c
+
+test_resolve_LDADD = \
+ libshared.la
+
automake_sources = $(patsubst src/libsystemd/%,$(outdir)/%,$(filter %.c,$($(automake_name)_SOURCES) $(nodist_$(automake_name)_SOURCES)))
$(eval $(value automake2autothing))
_subdirs := $(notdir $(patsubst %/,%,$(dir $(call automake_sources,libsystemd-internal.la))))
diff --git a/src/bus-proxyd/Makefile b/src/systemd-bus-proxyd/Makefile
index ef70e3e456..83f3552d6d 100644
--- a/src/bus-proxyd/Makefile
+++ b/src/systemd-bus-proxyd/Makefile
@@ -23,22 +23,6 @@
include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
include $(topsrcdir)/build-aux/Makefile.head.mk
-noinst_LTLIBRARIES += \
- libbus-proxy-core.la
-
-libbus_proxy_core_la_SOURCES = \
- src/bus-proxyd/bus-xml-policy.c \
- src/bus-proxyd/bus-xml-policy.h \
- src/bus-proxyd/driver.c \
- src/bus-proxyd/driver.h \
- src/bus-proxyd/proxy.c \
- src/bus-proxyd/proxy.h \
- src/bus-proxyd/synthesize.c \
- src/bus-proxyd/synthesize.h
-
-libbus_proxy_core_la_LIBADD = \
- libshared.la
-
systemd_bus_proxyd_SOURCES = \
src/bus-proxyd/bus-proxyd.c
@@ -46,13 +30,6 @@ systemd_bus_proxyd_LDADD = \
libbus-proxy-core.la \
libshared.la
-systemd_stdio_bridge_SOURCES = \
- src/bus-proxyd/stdio-bridge.c
-
-systemd_stdio_bridge_LDADD = \
- libbus-proxy-core.la \
- libshared.la
-
nodist_systemunit_DATA += \
units/systemd-bus-proxyd.service
diff --git a/src/bus-proxyd/bus-proxyd.c b/src/systemd-bus-proxyd/bus-proxyd.c
index 17b80c3e9a..17b80c3e9a 100644
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/systemd-bus-proxyd/bus-proxyd.c
diff --git a/src/systemd-stdio-bridge/Makefile b/src/systemd-stdio-bridge/Makefile
new file mode 100644
index 0000000000..24852e78ed
--- /dev/null
+++ b/src/systemd-stdio-bridge/Makefile
@@ -0,0 +1,34 @@
+# -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+# This file is part of systemd.
+#
+# Copyright 2010-2012 Lennart Poettering
+# Copyright 2010-2012 Kay Sievers
+# Copyright 2013 Zbigniew Jędrzejewski-Szmek
+# Copyright 2013 David Strauss
+# Copyright 2016 Luke Shumaker
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# 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 $(topsrcdir)/build-aux/Makefile.head.mk
+
+systemd_stdio_bridge_SOURCES = \
+ src/bus-proxyd/stdio-bridge.c
+
+systemd_stdio_bridge_LDADD = \
+ libbus-proxy-core.la \
+ libshared.la
+
+$(eval $(value automake2autothing))
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/bus-proxyd/stdio-bridge.c b/src/systemd-stdio-bridge/stdio-bridge.c
index 60c4a08325..60c4a08325 100644
--- a/src/bus-proxyd/stdio-bridge.c
+++ b/src/systemd-stdio-bridge/stdio-bridge.c
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2025-04-29 04:25:56 +0000