diff options
| -rw-r--r-- | Makefile.am | 18 | ||||
| -rw-r--r-- | src/Makefile | 1 | ||||
| -rw-r--r-- | src/grp-journal/Makefile | 1 | ||||
| -rw-r--r-- | src/grp-journal/libjournal-core/Makefile | 58 | ||||
| -rw-r--r-- | src/grp-journal/libjournal-core/src/Makefile | 30 | ||||
| -rw-r--r-- | src/grp-machine/libmachine-core/test/Makefile (renamed from src/libsystemd-firewall/Makefile) | 22 | ||||
| -rw-r--r-- | src/grp-machine/systemd-machined/Makefile | 9 | ||||
| -rw-r--r-- | src/grp-resolve/libbasic-dns/Makefile | 80 | ||||
| -rw-r--r-- | src/grp-resolve/libbasic-dns/src/Makefile | 80 | ||||
| -rw-r--r-- | src/grp-system/Makefile | 1 | ||||
| -rw-r--r-- | src/grp-system/libcore/Makefile | 170 | ||||
| -rw-r--r-- | src/grp-system/libcore/src/Makefile | 142 | ||||
| -rw-r--r-- | src/libsystemd-firewall/src/Makefile | 15 |
13 files changed, 281 insertions, 346 deletions
diff --git a/Makefile.am b/Makefile.am index cdc8b70c5e..df146b1d04 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1209,7 +1209,7 @@ libsystemd_shared_la_LDFLAGS = \ $(AM_LDFLAGS) \ -release $(PACKAGE_VERSION) -#@auto/libfirewall/Makefile ---------------------------------------------------- +#@src/libsystemd-firewall/src/Makefile ----------------------------------------- if HAVE_LIBIPTC noinst_LTLIBRARIES += \ libfirewall.la @@ -1235,7 +1235,7 @@ SYSINIT_TARGET_WANTS += \ ldconfig.service endif # ENABLE_LDCONFIG -#@auto/libcore/Makefile -------------------------------------------------------- +#@src/grp-system/libcore/src/Makefile ------------------------------------------ noinst_LTLIBRARIES += \ libcore.la @@ -1480,7 +1480,7 @@ src/journal/audit_type-to-name.h: src/journal/audit_type-list.txt $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *audit_type_to_string(int type) {\n\tswitch(type) {" } {printf " case AUDIT_%s: return \"%s\";\n", $$1, $$1 } END{ print " default: return NULL;\n\t}\n}\n" }' <$< >$@ -#@auto/libbasic-dns/Makefile +#@src/grp-resolve/libbasic-dns/src/Makefile src/resolve/dns_type-list.txt: src/resolve/dns-type.h $(AM_V_at)$(MKDIR_P) $(dir $@) @@ -4378,7 +4378,7 @@ test_audit_type_SOURCES = \ test_audit_type_LDADD = \ libjournal-core.la -#@auto/libjournal-core/Makefile +#@src/grp-journal/libjournal-core/src/Makefile libjournal_core_la_SOURCES = \ src/journal/journald-kmsg.c \ src/journal/journald-kmsg.h \ @@ -5241,7 +5241,7 @@ machinectl_LDADD = \ rootbin_PROGRAMS += \ machinectl -#@auto/systemd-machined/Makefile +#@src/grp-machine/libmachine-core/test/Makefile test_machine_tables_SOURCES = \ src/machine/test-machine-tables.c @@ -5251,6 +5251,7 @@ test_machine_tables_LDADD = \ tests += \ test-machine-tables +#@auto/systemd-machined/Makefile nodist_systemunit_DATA += \ units/systemd-machined.service @@ -5649,7 +5650,7 @@ dist_bashcompletion_data += \ dist_zshcompletion_data += \ shell-completion/zsh/_systemd-resolve -#@auto/libbasic-dns/Makefile +#@src/grp-resolve/libbasic-dns/src/Makefile tests += \ test-dns-packet \ test-resolve-tables \ @@ -6821,26 +6822,21 @@ sd.CPPFLAGS += $(libsystemd-network.CPPFLAGS) #@src/grp-journal/grp-remote/Makefile #@src/grp-journal/grp-remote/libsystemd-microhttpd/Makefile #@src/grp-journal/grp-remote/libsystemd-microhttpd/src/Makefile -#@src/grp-journal/libjournal-core/src/Makefile #@src/grp-locale/Makefile #@src/grp-machine/Makefile #@src/grp-machine/grp-import/Makefile #@src/grp-machine/grp-import/libimport/Makefile #@src/grp-resolve/Makefile #@src/grp-resolve/libbasic-dns/Makefile -#@src/grp-resolve/libbasic-dns/src/Makefile #@src/grp-resolve/libbasic-dns/test/Makefile #@src/grp-system/Makefile #@src/grp-system/grp-utils/Makefile -#@src/grp-system/libcore/src/Makefile #@src/grp-timedate/Makefile #@src/grp-utils/Makefile -#@src/libsystemd-firewall/src/Makefile #@src/libsystemd-gcrypt/Makefile #@src/libsystemd-gcrypt/src/Makefile #@src/libsystemd/src/sd-bus/Makefile #@src/libsystemd/src/sd-hwdb/Makefile -#@src/libudev/Makefile #@all include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/Makefile b/src/Makefile index cb104f7fdb..813c10b1de 100644 --- a/src/Makefile +++ b/src/Makefile @@ -40,7 +40,6 @@ nested.subdirs += grp-udev nested.subdirs += grp-utils nested.subdirs += libsystemd nested.subdirs += libsystemd-basic -nested.subdirs += libsystemd-firewall nested.subdirs += libsystemd-gcrypt nested.subdirs += libsystemd-network nested.subdirs += libsystemd-shared diff --git a/src/grp-journal/Makefile b/src/grp-journal/Makefile index 01802eff17..2b4a366f8a 100644 --- a/src/grp-journal/Makefile +++ b/src/grp-journal/Makefile @@ -190,7 +190,6 @@ EXTRA_DIST += \ nested.subdirs += grp-remote nested.subdirs += journalctl -nested.subdirs += libjournal-core nested.subdirs += systemd-cat nested.subdirs += systemd-journald diff --git a/src/grp-journal/libjournal-core/Makefile b/src/grp-journal/libjournal-core/Makefile deleted file mode 100644 index 4fb664ec33..0000000000 --- a/src/grp-journal/libjournal-core/Makefile +++ /dev/null @@ -1,58 +0,0 @@ -# -*- 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 - -libjournal_core_la_SOURCES = \ - src/journal/journald-kmsg.c \ - src/journal/journald-kmsg.h \ - src/journal/journald-syslog.c \ - src/journal/journald-syslog.h \ - src/journal/journald-stream.c \ - src/journal/journald-stream.h \ - src/journal/journald-server.c \ - src/journal/journald-server.h \ - src/journal/journald-console.c \ - src/journal/journald-console.h \ - src/journal/journald-wall.c \ - src/journal/journald-wall.h \ - src/journal/journald-native.c \ - src/journal/journald-native.h \ - src/journal/journald-audit.c \ - src/journal/journald-audit.h \ - src/journal/journald-rate-limit.c \ - src/journal/journald-rate-limit.h \ - src/journal/journal-internal.h - -nodist_libjournal_core_la_SOURCES = \ - src/journal/journald-gperf.c - -libjournal_core_la_LIBADD = \ - libsystemd-shared.la - -noinst_LTLIBRARIES += \ - libjournal-core.la - -nested.subdirs += src - -include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-journal/libjournal-core/src/Makefile b/src/grp-journal/libjournal-core/src/Makefile index 60150788d8..6ea0446e27 100644 --- a/src/grp-journal/libjournal-core/src/Makefile +++ b/src/grp-journal/libjournal-core/src/Makefile @@ -23,4 +23,34 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk +libjournal_core_la_SOURCES = \ + src/journal/journald-kmsg.c \ + src/journal/journald-kmsg.h \ + src/journal/journald-syslog.c \ + src/journal/journald-syslog.h \ + src/journal/journald-stream.c \ + src/journal/journald-stream.h \ + src/journal/journald-server.c \ + src/journal/journald-server.h \ + src/journal/journald-console.c \ + src/journal/journald-console.h \ + src/journal/journald-wall.c \ + src/journal/journald-wall.h \ + src/journal/journald-native.c \ + src/journal/journald-native.h \ + src/journal/journald-audit.c \ + src/journal/journald-audit.h \ + src/journal/journald-rate-limit.c \ + src/journal/journald-rate-limit.h \ + src/journal/journal-internal.h + +nodist_libjournal_core_la_SOURCES = \ + src/journal/journald-gperf.c + +libjournal_core_la_LIBADD = \ + libsystemd-shared.la + +noinst_LTLIBRARIES += \ + libjournal-core.la + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd-firewall/Makefile b/src/grp-machine/libmachine-core/test/Makefile index cd29551ff2..a75e11f3ac 100644 --- a/src/libsystemd-firewall/Makefile +++ b/src/grp-machine/libmachine-core/test/Makefile @@ -20,24 +20,16 @@ # # 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 $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -ifneq ($(HAVE_LIBIPTC),) -noinst_LTLIBRARIES += \ - libsystemd-firewall.la +test_machine_tables_SOURCES = \ + src/machine/test-machine-tables.c -libsystemd-firewall_la_SOURCES = \ - src/shared/firewall-util.h \ - src/shared/firewall-util.c +test_machine_tables_LDADD = \ + libmachine-core.la -libsystemd-firewall_la_CFLAGS = \ - $(LIBIPTC_CFLAGS) - -libsystemd-firewall_la_LIBADD = \ - $(LIBIPTC_LIBS) -endif # HAVE_LIBIPTC - -nested.subdirs += src +tests += \ + test-machine-tables include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-machine/systemd-machined/Makefile b/src/grp-machine/systemd-machined/Makefile index 1ca956f98e..432a792a18 100644 --- a/src/grp-machine/systemd-machined/Makefile +++ b/src/grp-machine/systemd-machined/Makefile @@ -33,15 +33,6 @@ systemd_machined_LDADD = \ rootlibexec_PROGRAMS += \ systemd-machined -test_machine_tables_SOURCES = \ - src/machine/test-machine-tables.c - -test_machine_tables_LDADD = \ - libmachine-core.la - -tests += \ - test-machine-tables - nodist_systemunit_DATA += \ units/systemd-machined.service diff --git a/src/grp-resolve/libbasic-dns/Makefile b/src/grp-resolve/libbasic-dns/Makefile index c55e35bada..ab74e03f63 100644 --- a/src/grp-resolve/libbasic-dns/Makefile +++ b/src/grp-resolve/libbasic-dns/Makefile @@ -23,86 +23,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -$(outdir)/dns_type-list.txt: src/resolve/dns-type.h - $(AM_V_GEN)$(SED) -n -r 's/.* DNS_TYPE_(\w+).*/\1/p' <$< >$@ - -$(outdir)/dns_type-to-name.h: src/resolve/dns_type-list.txt - $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *dns_type_to_string(int type) {\n\tswitch(type) {" } {printf " case DNS_TYPE_%s: return ", $$1; sub(/_/, "-"); printf "\"%s\";\n", $$1 } END{ print " default: return NULL;\n\t}\n}\n" }' <$< >$@ - -$(outdir)/dns_type-from-name.gperf: src/resolve/dns_type-list.txt - $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct dns_type_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { s=$$1; sub(/_/, "-", s); printf "%s, ", $$s; printf "DNS_TYPE_%s\n", $$1 }' <$< >$@ - -tests += \ - test-dns-packet \ - test-resolve-tables \ - test-dnssec - -manual_tests += \ - test-dnssec-complex - -test_resolve_tables_SOURCES = \ - src/resolve/test-resolve-tables.c \ - src/resolve/dns_type-from-name.h \ - src/resolve/dns_type-to-name.h \ - $(basic_dns_sources) \ - src/shared/test-tables.h - -test_resolve_tables_CFLAGS = \ - $(GCRYPT_CFLAGS) - -test_resolve_tables_LDADD = \ - libsystemd-shared.la \ - $(GCRYPT_LIBS) \ - -lm - -test_dns_packet_SOURCES = \ - src/resolve/test-dns-packet.c \ - $(basic_dns_sources) - -test_dns_packet_CPPFLAGS = \ - -DRESOLVE_TEST_DIR=\"$(abs_top_srcdir)/src/resolve/test-data\" - -test_dns_packet_CFLAGS = \ - $(GCRYPT_CFLAGS) - -test_dns_packet_LDADD = \ - libsystemd-shared.la \ - $(GCRYPT_LIBS) \ - -lm - -EXTRA_DIST += \ - src/resolve/test-data/_openpgpkey.fedoraproject.org.pkts \ - src/resolve/test-data/fedoraproject.org.pkts \ - src/resolve/test-data/gandi.net.pkts \ - src/resolve/test-data/google.com.pkts \ - src/resolve/test-data/root.pkts \ - src/resolve/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts \ - src/resolve/test-data/teamits.com.pkts \ - src/resolve/test-data/zbyszek@fedoraproject.org.pkts \ - src/resolve/test-data/_443._tcp.fedoraproject.org.pkts \ - src/resolve/test-data/kyhwana.org.pkts \ - src/resolve/test-data/fake-caa.pkts - -test_dnssec_SOURCES = \ - src/resolve/test-dnssec.c \ - $(basic_dns_sources) - -test_dnssec_CFLAGS = \ - $(GCRYPT_CFLAGS) - -test_dnssec_LDADD = \ - libsystemd-shared.la \ - $(GCRYPT_LIBS) \ - -lm - -test_dnssec_complex_SOURCES = \ - src/resolve/test-dnssec-complex.c \ - src/resolve/dns-type.c \ - src/resolve/dns-type.h - -test_dnssec_complex_LDADD = \ - libsystemd-shared.la - gperf_txt_sources += \ src/resolve/dns_type-list.txt diff --git a/src/grp-resolve/libbasic-dns/src/Makefile b/src/grp-resolve/libbasic-dns/src/Makefile index 60150788d8..b2532a81ab 100644 --- a/src/grp-resolve/libbasic-dns/src/Makefile +++ b/src/grp-resolve/libbasic-dns/src/Makefile @@ -23,4 +23,84 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk +$(outdir)/dns_type-list.txt: src/resolve/dns-type.h + $(AM_V_GEN)$(SED) -n -r 's/.* DNS_TYPE_(\w+).*/\1/p' <$< >$@ + +$(outdir)/dns_type-to-name.h: src/resolve/dns_type-list.txt + $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *dns_type_to_string(int type) {\n\tswitch(type) {" } {printf " case DNS_TYPE_%s: return ", $$1; sub(/_/, "-"); printf "\"%s\";\n", $$1 } END{ print " default: return NULL;\n\t}\n}\n" }' <$< >$@ + +$(outdir)/dns_type-from-name.gperf: src/resolve/dns_type-list.txt + $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct dns_type_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { s=$$1; sub(/_/, "-", s); printf "%s, ", $$s; printf "DNS_TYPE_%s\n", $$1 }' <$< >$@ + +tests += \ + test-dns-packet \ + test-resolve-tables \ + test-dnssec + +manual_tests += \ + test-dnssec-complex + +test_resolve_tables_SOURCES = \ + src/resolve/test-resolve-tables.c \ + src/resolve/dns_type-from-name.h \ + src/resolve/dns_type-to-name.h \ + $(basic_dns_sources) \ + src/shared/test-tables.h + +test_resolve_tables_CFLAGS = \ + $(GCRYPT_CFLAGS) + +test_resolve_tables_LDADD = \ + libsystemd-shared.la \ + $(GCRYPT_LIBS) \ + -lm + +test_dns_packet_SOURCES = \ + src/resolve/test-dns-packet.c \ + $(basic_dns_sources) + +test_dns_packet_CPPFLAGS = \ + -DRESOLVE_TEST_DIR=\"$(abs_top_srcdir)/src/resolve/test-data\" + +test_dns_packet_CFLAGS = \ + $(GCRYPT_CFLAGS) + +test_dns_packet_LDADD = \ + libsystemd-shared.la \ + $(GCRYPT_LIBS) \ + -lm + +EXTRA_DIST += \ + src/resolve/test-data/_openpgpkey.fedoraproject.org.pkts \ + src/resolve/test-data/fedoraproject.org.pkts \ + src/resolve/test-data/gandi.net.pkts \ + src/resolve/test-data/google.com.pkts \ + src/resolve/test-data/root.pkts \ + src/resolve/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts \ + src/resolve/test-data/teamits.com.pkts \ + src/resolve/test-data/zbyszek@fedoraproject.org.pkts \ + src/resolve/test-data/_443._tcp.fedoraproject.org.pkts \ + src/resolve/test-data/kyhwana.org.pkts \ + src/resolve/test-data/fake-caa.pkts + +test_dnssec_SOURCES = \ + src/resolve/test-dnssec.c \ + $(basic_dns_sources) + +test_dnssec_CFLAGS = \ + $(GCRYPT_CFLAGS) + +test_dnssec_LDADD = \ + libsystemd-shared.la \ + $(GCRYPT_LIBS) \ + -lm + +test_dnssec_complex_SOURCES = \ + src/resolve/test-dnssec-complex.c \ + src/resolve/dns-type.c \ + src/resolve/dns-type.h + +test_dnssec_complex_LDADD = \ + libsystemd-shared.la + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-system/Makefile b/src/grp-system/Makefile index 482fbb5670..a20acc9748 100644 --- a/src/grp-system/Makefile +++ b/src/grp-system/Makefile @@ -24,7 +24,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk nested.subdirs += grp-utils -nested.subdirs += libcore nested.subdirs += systemctl nested.subdirs += systemd nested.subdirs += systemd-shutdown diff --git a/src/grp-system/libcore/Makefile b/src/grp-system/libcore/Makefile deleted file mode 100644 index 9468b89e74..0000000000 --- a/src/grp-system/libcore/Makefile +++ /dev/null @@ -1,170 +0,0 @@ -# -*- 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 += \ - libcore.la - -libcore_la_SOURCES = \ - src/core/unit.c \ - src/core/unit.h \ - src/core/unit-printf.c \ - src/core/unit-printf.h \ - src/core/job.c \ - src/core/job.h \ - src/core/manager.c \ - src/core/manager.h \ - src/core/transaction.c \ - src/core/transaction.h \ - src/core/load-fragment.c \ - src/core/load-fragment.h \ - src/core/service.c \ - src/core/service.h \ - src/core/socket.c \ - src/core/socket.h \ - src/core/busname.c \ - src/core/busname.h \ - src/core/bus-policy.c \ - src/core/bus-policy.h \ - src/core/target.c \ - src/core/target.h \ - src/core/device.c \ - src/core/device.h \ - src/core/mount.c \ - src/core/mount.h \ - src/core/automount.c \ - src/core/automount.h \ - src/core/swap.c \ - src/core/swap.h \ - src/core/timer.c \ - src/core/timer.h \ - src/core/path.c \ - src/core/path.h \ - src/core/slice.c \ - src/core/slice.h \ - src/core/scope.c \ - src/core/scope.h \ - src/core/load-dropin.c \ - src/core/load-dropin.h \ - src/core/execute.c \ - src/core/execute.h \ - src/core/kill.c \ - src/core/kill.h \ - src/core/dbus.c \ - src/core/dbus.h \ - src/core/dbus-manager.c \ - src/core/dbus-manager.h \ - src/core/dbus-unit.c \ - src/core/dbus-unit.h \ - src/core/dbus-job.c \ - src/core/dbus-job.h \ - src/core/dbus-service.c \ - src/core/dbus-service.h \ - src/core/dbus-socket.c \ - src/core/dbus-socket.h \ - src/core/dbus-busname.c \ - src/core/dbus-busname.h \ - src/core/dbus-target.c \ - src/core/dbus-target.h \ - src/core/dbus-device.c \ - src/core/dbus-device.h \ - src/core/dbus-mount.c \ - src/core/dbus-mount.h \ - src/core/dbus-automount.c \ - src/core/dbus-automount.h \ - src/core/dbus-swap.c \ - src/core/dbus-swap.h \ - src/core/dbus-timer.c \ - src/core/dbus-timer.h \ - src/core/dbus-path.c \ - src/core/dbus-path.h \ - src/core/dbus-slice.c \ - src/core/dbus-slice.h \ - src/core/dbus-scope.c \ - src/core/dbus-scope.h \ - src/core/dbus-execute.c \ - src/core/dbus-execute.h \ - src/core/dbus-kill.c \ - src/core/dbus-kill.h \ - src/core/dbus-cgroup.c \ - src/core/dbus-cgroup.h \ - src/core/cgroup.c \ - src/core/cgroup.h \ - src/core/selinux-access.c \ - src/core/selinux-access.h \ - src/core/selinux-setup.c \ - src/core/selinux-setup.h \ - src/core/smack-setup.c \ - src/core/smack-setup.h \ - src/core/ima-setup.c \ - src/core/ima-setup.h \ - src/core/locale-setup.h \ - src/core/locale-setup.c \ - src/core/hostname-setup.c \ - src/core/hostname-setup.h \ - src/core/machine-id-setup.c \ - src/core/machine-id-setup.h \ - src/core/mount-setup.c \ - src/core/mount-setup.h \ - src/core/kmod-setup.c \ - src/core/kmod-setup.h \ - src/core/loopback-setup.h \ - src/core/loopback-setup.c \ - src/core/namespace.c \ - src/core/namespace.h \ - src/core/killall.h \ - src/core/killall.c \ - src/core/audit-fd.c \ - src/core/audit-fd.h \ - src/core/show-status.c \ - src/core/show-status.h \ - src/core/failure-action.c \ - src/core/failure-action.h - -nodist_libcore_la_SOURCES = \ - src/core/load-fragment-gperf.c \ - src/core/load-fragment-gperf-nulstr.c - -libcore_la_CFLAGS = \ - $(PAM_CFLAGS) \ - $(AUDIT_CFLAGS) \ - $(KMOD_CFLAGS) \ - $(APPARMOR_CFLAGS) \ - $(MOUNT_CFLAGS) \ - $(SECCOMP_CFLAGS) - -libcore_la_LIBADD = \ - libsystemd-shared.la \ - $(PAM_LIBS) \ - $(AUDIT_LIBS) \ - $(KMOD_LIBS) \ - $(APPARMOR_LIBS) \ - $(MOUNT_LIBS) - -$(outdir)/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf - $(AM_V_GEN)$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ - -nested.subdirs += src - -include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-system/libcore/src/Makefile b/src/grp-system/libcore/src/Makefile index 60150788d8..22ff3df485 100644 --- a/src/grp-system/libcore/src/Makefile +++ b/src/grp-system/libcore/src/Makefile @@ -23,4 +23,146 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk +noinst_LTLIBRARIES += \ + libcore.la + +libcore_la_SOURCES = \ + src/core/unit.c \ + src/core/unit.h \ + src/core/unit-printf.c \ + src/core/unit-printf.h \ + src/core/job.c \ + src/core/job.h \ + src/core/manager.c \ + src/core/manager.h \ + src/core/transaction.c \ + src/core/transaction.h \ + src/core/load-fragment.c \ + src/core/load-fragment.h \ + src/core/service.c \ + src/core/service.h \ + src/core/socket.c \ + src/core/socket.h \ + src/core/busname.c \ + src/core/busname.h \ + src/core/bus-policy.c \ + src/core/bus-policy.h \ + src/core/target.c \ + src/core/target.h \ + src/core/device.c \ + src/core/device.h \ + src/core/mount.c \ + src/core/mount.h \ + src/core/automount.c \ + src/core/automount.h \ + src/core/swap.c \ + src/core/swap.h \ + src/core/timer.c \ + src/core/timer.h \ + src/core/path.c \ + src/core/path.h \ + src/core/slice.c \ + src/core/slice.h \ + src/core/scope.c \ + src/core/scope.h \ + src/core/load-dropin.c \ + src/core/load-dropin.h \ + src/core/execute.c \ + src/core/execute.h \ + src/core/kill.c \ + src/core/kill.h \ + src/core/dbus.c \ + src/core/dbus.h \ + src/core/dbus-manager.c \ + src/core/dbus-manager.h \ + src/core/dbus-unit.c \ + src/core/dbus-unit.h \ + src/core/dbus-job.c \ + src/core/dbus-job.h \ + src/core/dbus-service.c \ + src/core/dbus-service.h \ + src/core/dbus-socket.c \ + src/core/dbus-socket.h \ + src/core/dbus-busname.c \ + src/core/dbus-busname.h \ + src/core/dbus-target.c \ + src/core/dbus-target.h \ + src/core/dbus-device.c \ + src/core/dbus-device.h \ + src/core/dbus-mount.c \ + src/core/dbus-mount.h \ + src/core/dbus-automount.c \ + src/core/dbus-automount.h \ + src/core/dbus-swap.c \ + src/core/dbus-swap.h \ + src/core/dbus-timer.c \ + src/core/dbus-timer.h \ + src/core/dbus-path.c \ + src/core/dbus-path.h \ + src/core/dbus-slice.c \ + src/core/dbus-slice.h \ + src/core/dbus-scope.c \ + src/core/dbus-scope.h \ + src/core/dbus-execute.c \ + src/core/dbus-execute.h \ + src/core/dbus-kill.c \ + src/core/dbus-kill.h \ + src/core/dbus-cgroup.c \ + src/core/dbus-cgroup.h \ + src/core/cgroup.c \ + src/core/cgroup.h \ + src/core/selinux-access.c \ + src/core/selinux-access.h \ + src/core/selinux-setup.c \ + src/core/selinux-setup.h \ + src/core/smack-setup.c \ + src/core/smack-setup.h \ + src/core/ima-setup.c \ + src/core/ima-setup.h \ + src/core/locale-setup.h \ + src/core/locale-setup.c \ + src/core/hostname-setup.c \ + src/core/hostname-setup.h \ + src/core/machine-id-setup.c \ + src/core/machine-id-setup.h \ + src/core/mount-setup.c \ + src/core/mount-setup.h \ + src/core/kmod-setup.c \ + src/core/kmod-setup.h \ + src/core/loopback-setup.h \ + src/core/loopback-setup.c \ + src/core/namespace.c \ + src/core/namespace.h \ + src/core/killall.h \ + src/core/killall.c \ + src/core/audit-fd.c \ + src/core/audit-fd.h \ + src/core/show-status.c \ + src/core/show-status.h \ + src/core/failure-action.c \ + src/core/failure-action.h + +nodist_libcore_la_SOURCES = \ + src/core/load-fragment-gperf.c \ + src/core/load-fragment-gperf-nulstr.c + +libcore_la_CFLAGS = \ + $(PAM_CFLAGS) \ + $(AUDIT_CFLAGS) \ + $(KMOD_CFLAGS) \ + $(APPARMOR_CFLAGS) \ + $(MOUNT_CFLAGS) \ + $(SECCOMP_CFLAGS) + +libcore_la_LIBADD = \ + libsystemd-shared.la \ + $(PAM_LIBS) \ + $(AUDIT_LIBS) \ + $(KMOD_LIBS) \ + $(APPARMOR_LIBS) \ + $(MOUNT_LIBS) + +$(outdir)/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf + $(AM_V_GEN)$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd-firewall/src/Makefile b/src/libsystemd-firewall/src/Makefile index 8166d5a253..797c9b6819 100644 --- a/src/libsystemd-firewall/src/Makefile +++ b/src/libsystemd-firewall/src/Makefile @@ -23,4 +23,19 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk +ifneq ($(HAVE_LIBIPTC),) +noinst_LTLIBRARIES += \ + libsystemd-firewall.la + +libsystemd-firewall_la_SOURCES = \ + src/shared/firewall-util.h \ + src/shared/firewall-util.c + +libsystemd-firewall_la_CFLAGS = \ + $(LIBIPTC_CFLAGS) + +libsystemd-firewall_la_LIBADD = \ + $(LIBIPTC_LIBS) +endif # HAVE_LIBIPTC + include $(topsrcdir)/build-aux/Makefile.tail.mk |