From f22246a490fcb1e8d60f8ae0759b3f1daca7c061 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 10 Aug 2016 11:22:38 -0400 Subject: fix build system --- src/grp-boot/systemd-boot/Makefile | 8 +- src/grp-system/systemd/Makefile | 2 + src/grp-udev/Makefile | 1 + src/grp-udev/libudev-core/Makefile | 4 +- src/grp-udev/libudev-core/udev.conf | 3 - src/grp-udev/libudev-core/udev.pc.in | 5 - src/grp-udev/udev.conf | 3 + src/grp-udev/udev.pc.in | 5 + src/libsystemd/Makefile | 14 ++- src/libsystemd/src/Makefile | 165 ++++----------------------------- src/libsystemd/src/sd-journal/Makefile | 5 +- src/libsystemd/src/test.mk | 152 ++++++++++++++++++++++++++++++ src/libudev/Makefile | 4 +- src/nss-myhostname/Makefile | 2 - 14 files changed, 203 insertions(+), 170 deletions(-) delete mode 100644 src/grp-udev/libudev-core/udev.conf delete mode 100644 src/grp-udev/libudev-core/udev.pc.in create mode 100644 src/grp-udev/udev.conf create mode 100644 src/grp-udev/udev.pc.in create mode 100644 src/libsystemd/src/test.mk (limited to 'src') diff --git a/src/grp-boot/systemd-boot/Makefile b/src/grp-boot/systemd-boot/Makefile index 2a56560c2c..9766e1bb82 100644 --- a/src/grp-boot/systemd-boot/Makefile +++ b/src/grp-boot/systemd-boot/Makefile @@ -113,8 +113,7 @@ systemd_boot_sources = \ src/boot/efi/boot.c systemd_boot = systemd-boot$(EFI_MACHINE_TYPE_NAME).efi -std.out_files += $(systemd_boot) -std.sys_files += $(bootlibdir)/$(systemd_boot) +bootlib_DATA += $(systemd_boot) $(outdir)/systemd-boot.so: $(addprefix $(outdir)/,$(notdir $(systemd_boot_sources:.c=.o))) # ------------------------------------------------------------------------------ stub_headers = \ @@ -137,8 +136,7 @@ stub_sources = \ src/boot/efi/stub.c stub = linux$(EFI_MACHINE_TYPE_NAME).efi.stub -std.out_files += $(stub) -std.sys_files += $(bootlibdir)/$(stub) +bootlib_DATA += $(stub) $(outdir)/linux.so: $(addprefix $(outdir)/,$(notdir $(stub_sources:.c=.o))) # ------------------------------------------------------------------------------ $(outdir)/test-efi-disk.img: $(outdir)/$(systemd_boot) $(outdir)/$(stub) $(srcdir)/test-efi-create-disk.sh @@ -147,7 +145,7 @@ $(outdir)/test-efi-disk.img: $(outdir)/$(systemd_boot) $(outdir)/$(stub) $(srcdi test-efi: $(outdir)/test-efi-disk.img $(QEMU) -machine accel=kvm -m 1024 -bios $(QEMU_BIOS) -snapshot test-efi-disk.img -std.clean_files += test-efi-disk.img +files.out.int += test-efi-disk.img # ------------------------------------------------------------------------------ endif # HAVE_GNUEFI endif # ENABLE_EFI diff --git a/src/grp-system/systemd/Makefile b/src/grp-system/systemd/Makefile index 91dca30b92..4637b39de6 100644 --- a/src/grp-system/systemd/Makefile +++ b/src/grp-system/systemd/Makefile @@ -68,6 +68,8 @@ dist_systemunit_DATA_busnames += \ BUSNAMES_TARGET_WANTS += \ org.freedesktop.systemd1.busname +sd.sed_files += $(notdir $(patsubst %.in,%,$(filter %.in,$(EXTRA_DIST)))) + sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" sd.CPPFLAGS += -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" diff --git a/src/grp-udev/Makefile b/src/grp-udev/Makefile index 67a17d74a0..67e20c65a2 100644 --- a/src/grp-udev/Makefile +++ b/src/grp-udev/Makefile @@ -69,6 +69,7 @@ SYSINIT_TARGET_WANTS += \ systemd-udevd.service \ systemd-udev-trigger.service +sd.sed_files += $(notdir $(patsubst %.in,%,$(filter %.in,$(EXTRA_DIST)))) nested.subdirs += systemd-udevd udevadm nested.subdirs += ata_id cdrom_id collect mtd_probe scsi_id v4l_id diff --git a/src/grp-udev/libudev-core/Makefile b/src/grp-udev/libudev-core/Makefile index f2b8c88eaf..da72594005 100644 --- a/src/grp-udev/libudev-core/Makefile +++ b/src/grp-udev/libudev-core/Makefile @@ -98,8 +98,8 @@ libudev_core_la_SOURCES += \ src/systemd/sd-login.h endif # HAVE_ACL -libudev-core.la.SOURCES = $(patsubst src/udev/%,%,$(filter %.c,$(_libudev_core_la_SOURCES) $(_nodist_libudev_core_la_SOURCES))) -libudev-core.la.DEPENDS = $(addprefix $(outdir)/,$(libudev-core.la.SOURCES:.c=.lo)) +sd.libudev-core_SOURCES = $(patsubst src/udev/%,%,$(filter %.c,$(_libudev_core_la_SOURCES) $(_nodist_libudev_core_la_SOURCES))) +$(outdir)/libudev-core.la: $(addprefix $(outdir)/,$(sd.libudev-core_SOURCES:.c=.lo)) nested.subdirs += net $(outdir)/udev-builtin-keyboard.lo: $(outdir)/keyboard-keys-from-name.h sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" diff --git a/src/grp-udev/libudev-core/udev.conf b/src/grp-udev/libudev-core/udev.conf deleted file mode 100644 index 47d1433002..0000000000 --- a/src/grp-udev/libudev-core/udev.conf +++ /dev/null @@ -1,3 +0,0 @@ -# see udev.conf(5) for details - -#udev_log="info" diff --git a/src/grp-udev/libudev-core/udev.pc.in b/src/grp-udev/libudev-core/udev.pc.in deleted file mode 100644 index a0c2e82d47..0000000000 --- a/src/grp-udev/libudev-core/udev.pc.in +++ /dev/null @@ -1,5 +0,0 @@ -Name: udev -Description: udev -Version: @VERSION@ - -udevdir=@udevlibexecdir@ diff --git a/src/grp-udev/udev.conf b/src/grp-udev/udev.conf new file mode 100644 index 0000000000..47d1433002 --- /dev/null +++ b/src/grp-udev/udev.conf @@ -0,0 +1,3 @@ +# see udev.conf(5) for details + +#udev_log="info" diff --git a/src/grp-udev/udev.pc.in b/src/grp-udev/udev.pc.in new file mode 100644 index 0000000000..a0c2e82d47 --- /dev/null +++ b/src/grp-udev/udev.pc.in @@ -0,0 +1,5 @@ +Name: udev +Description: udev +Version: @VERSION@ + +udevdir=@udevlibexecdir@ diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile index 61bf856c96..5c5d03a51d 100644 --- a/src/libsystemd/Makefile +++ b/src/libsystemd/Makefile @@ -52,10 +52,12 @@ libsystemd_la_LDFLAGS = \ $(libsystemd_internal_la_LIBADD) \ $(libsystemd_journal_internal_la_LIBADD) +libsystemd_la_LIBADD = $(libsystemd-internal.DEPENDS) + pkgconfiglib_DATA += \ src/libsystemd/libsystemd.pc -pkginclude_HEADERS += \ +_pkginclude_HEADERS += \ src/systemd/sd-bus.h \ src/systemd/sd-bus-protocol.h \ src/systemd/sd-bus-vtable.h \ @@ -64,6 +66,11 @@ pkginclude_HEADERS += \ src/systemd/sd-id128.h \ src/systemd/sd-daemon.h +_pkginclude_HEADERS += \ + src/systemd/sd-journal.h \ + src/systemd/sd-messages.h \ + src/systemd/_sd-common.h + rootlib_LTLIBRARIES += \ libsystemd.la @@ -105,6 +112,11 @@ nodist_test_libsystemd_sym_SOURCES = \ test_libsystemd_sym_LDADD = \ libsystemd.la +$(DESTDIR)$(pkgincludedir)/%.h: $(srcdir)/include/systemd/%.h + @$(NORMAL_INSTALL) + $(am.INSTALL_HEADERS) + +files.sys.all += $(addprefix $(pkgincludedir)/,$(notdir $(_pkginclude_HEADERS))) $(outdir)/libsystemd.la: $(srcdir)/libsystemd.sym nested.subdirs += src sd.sed_files += libsystemd.pc diff --git a/src/libsystemd/src/Makefile b/src/libsystemd/src/Makefile index 759c484bc9..10d3e668e8 100644 --- a/src/libsystemd/src/Makefile +++ b/src/libsystemd/src/Makefile @@ -116,141 +116,6 @@ 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_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 - -pkginclude_HEADERS += \ - src/systemd/sd-journal.h \ - src/systemd/sd-messages.h \ - src/systemd/_sd-common.h - _libsystemd_journal_internal_la_SOURCES = \ src/journal/sd-journal.c \ src/systemd/sd-journal.h \ @@ -276,7 +141,7 @@ _libsystemd_journal_internal_la_SOURCES = \ src/shared/gcrypt-util.h \ src/shared/gcrypt-util.c -nodist_libsystemd_journal_internal_la_SOURCES = \ +#nodist_libsystemd_journal_internal_la_SOURCES = \ src/journal/audit_type-to-name.h gperf_txt_sources += \ @@ -314,23 +179,25 @@ _libsystemd_journal_internal_la_SOURCES += \ libsystemd_journal_internal_la_LIBADD += \ $(GCRYPT_LIBS) -# fsprg.c is a drop-in file using void pointer arithmetic libsystemd_journal_internal_la_CFLAGS += \ - $(GCRYPT_CFLAGS) \ - -Wno-pointer-arith + $(GCRYPT_CFLAGS) endif # HAVE_GCRYPT -_noinst_LTLIBRARIES += \ +#noinst_LTLIBRARIES += \ libsystemd-journal-internal.la -libsystemd_internal_la_CFLAGS += $(libsystemd_journal_internal_la_CFLAGS) -libsystemd_internal_la_LIBADD += $(libsystemd_journal_internal_la_LIBADD) -libsystemd_internal_la_LDADD += $(libsystemd_journal_internal_la_LDADD) - -libsystemd-internal.la.SOURCES = -libsystemd-internal.la.SOURCES += $(patsubst src/libsystemd/%,%,$(filter %.c,$(_libsystemd_internal_la_SOURCES))) -libsystemd-internal.la.SOURCES += $(addprefix sd-journal/,$(notdir $(filter %.c,$(_libsystemd_journal_internal_la_SOURCES)))) -libsystemd-internal.la.DEPENDS = $(addprefix $(outdir)/,$(libsystemd-internal.la.SOURCES:.c=.lo)) -nested.subdirs += $(sort $(dir $(libsystemd-internal.la.SOURCES))) +# Hook into the `am` module +libsystemd_internal_la_CFLAGS += $(libsystemd_journal_internal_la_CFLAGS) +libsystemd_internal_la_LIBADD += $(libsystemd_journal_internal_la_LIBADD) + +# Don't bother trying to hook into the `am` module for the sources; the only +# thing it adds over declaring the dependencies is adding the appropriate +# directories to am.subdirs=>at.subdirs; but we can do that here just as easily +# with nested.subdirs. +sd.libsystemd_SOURCES = +sd.libsystemd_SOURCES += $(patsubst src/libsystemd/%,%,$(filter %.c,$(_libsystemd_internal_la_SOURCES))) +sd.libsystemd_SOURCES += $(addprefix sd-journal/,$(notdir $(filter %.c,$(_libsystemd_journal_internal_la_SOURCES)))) +$(outdir)/libsystemd-internal.la: $(addprefix $(outdir)/,$(sd.libsystemd_SOURCES:.c=.lo)) +nested.subdirs += $(sort $(dir $(sd.libsystemd_SOURCES))) include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/src/sd-journal/Makefile b/src/libsystemd/src/sd-journal/Makefile index c9d5c3dcd8..f13c2b51fa 100644 --- a/src/libsystemd/src/sd-journal/Makefile +++ b/src/libsystemd/src/sd-journal/Makefile @@ -29,11 +29,14 @@ audit_list_includes += -include libaudit.h endif # HAVE_AUDIT $(outdir)/audit_type-list.txt: $(call at.path,$(topsrcdir)/src/libbasic/include/basic/missing.h) - $(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM $(audit_list_includes) - $@ + $(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM $(audit_list_includes) - $@ $(outdir)/audit_type-to-name.h: $(outdir)/audit_type-list.txt $(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" }' <$< >$@ +# fsprg.c is a drop-in file using void pointer arithmetic +$(outdir)/fsprg.lo: sd.ALL_CFLAGS += -Wno-pointer-arith + sd.CPPFLAGS += $(libbasic.CPPFLAGS) sd.CPPFLAGS += -DCATALOG_DATABASE=\"$(catalogstatedir)/database\" $(outdir)/audit-type.lo: $(outdir)/audit_type-to-name.h diff --git a/src/libsystemd/src/test.mk b/src/libsystemd/src/test.mk new file mode 100644 index 0000000000..0290b33f6b --- /dev/null +++ b/src/libsystemd/src/test.mk @@ -0,0 +1,152 @@ +# -*- 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 . + +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_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 diff --git a/src/libudev/Makefile b/src/libudev/Makefile index 2601837e3a..b4c91d1738 100644 --- a/src/libudev/Makefile +++ b/src/libudev/Makefile @@ -38,6 +38,8 @@ libudev_la_LDFLAGS = \ -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \ -Wl,--version-script=$(srcdir)/libudev.sym +libudev_la_LIBADD += $(libudev-internal.DEPENDS) + pkgconfiglib_DATA += \ src/libudev/libudev.pc @@ -45,9 +47,7 @@ EXTRA_DIST += \ src/libudev/libudev.pc.in $(outdir)/test-libudev-sym.c: \ - $(srcdir)/libudev.sym \ $(srcdir)/udev.h - $(generate-sym-test) nodist_test_libudev_sym_SOURCES = \ test-libudev-sym.c diff --git a/src/nss-myhostname/Makefile b/src/nss-myhostname/Makefile index 201dbde20a..b5f6ff62aa 100644 --- a/src/nss-myhostname/Makefile +++ b/src/nss-myhostname/Makefile @@ -44,6 +44,4 @@ lib_LTLIBRARIES += \ libnss_myhostname.la endif # HAVE_MYHOSTNAME -libnss_myhostname_la_LIBADD += libshared.la # oops, because I moved local-addresses.{c,h} into libshared - include $(topsrcdir)/build-aux/Makefile.tail.mk -- cgit v1.2.3-54-g00ecf