Re: [systemd-devel] [PATCH 1/5] build-sys: move common libraries to separate Makefile
On Tue, 12.06.12 12:52, William Hubbs (w.d.hu...@gmail.com) wrote: heya, Sorry, not going to merge this. This patch is ugly, and I doubt you can fix it to make it less ugly. Split makefiles suck [1], and so do makefiles with even more ifdefs than we already have. Besides that it would probably be the first package where you can disable building the main component. Feel free to maintain such a patch downstream, git makes that easy. But I don't want to maintain that upstream. It makes my life harder, I'd break it all the time without noticing and so it has no place upstream. The first rule for all maintainers is only to merge stuff they themselves are willing to maintain. This is true for fringe patches, but even more on core stuff like build system changes that are essential for the whole package. My recommendation for distros who want udev without the rest of systemd is to build systemd normally and just pick the files you are interested in from make install. (And besides that, I am pretty sure you probably want to pick at least tmpfiles in addition to udev from the build tree). Sorry, Lennart Footnotes: [1] I mean, seriously, we made the clear decision to have only a single makefile and avoid recursive make and now with splitting this stuff up you undo that half-way. -- Lennart Poettering - Red Hat, Inc. ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] [PATCH 1/5] build-sys: move common libraries to separate Makefile
On Tue, Jun 19, 2012 at 10:31:30AM +0200, Lennart Poettering wrote: [1] I mean, seriously, we made the clear decision to have only a single makefile and avoid recursive make and now with splitting this stuff up you undo that half-way. Note that include Makefile-udev.am does not mean recursive make, the result is one Makefile. It's split of *automake* files. Karel -- Karel Zak k...@redhat.com http://karelzak.blogspot.com ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] [PATCH 1/5] build-sys: move common libraries to separate Makefile
On Tue, 19.06.12 10:45, Karel Zak (k...@redhat.com) wrote: On Tue, Jun 19, 2012 at 10:31:30AM +0200, Lennart Poettering wrote: [1] I mean, seriously, we made the clear decision to have only a single makefile and avoid recursive make and now with splitting this stuff up you undo that half-way. Note that include Makefile-udev.am does not mean recursive make, the result is one Makefile. It's split of *automake* files. Yes, i know. That's why I said half-way. Lennart -- Lennart Poettering - Red Hat, Inc. ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
[systemd-devel] [PATCH 1/5] build-sys: move common libraries to separate Makefile
--- Makefile-shared.am | 117 Makefile.am| 99 +--- 2 files changed, 118 insertions(+), 98 deletions(-) create mode 100644 Makefile-shared.am diff --git a/Makefile-shared.am b/Makefile-shared.am new file mode 100644 index 000..cdd318b --- /dev/null +++ b/Makefile-shared.am @@ -0,0 +1,117 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- */ +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# +# 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/. + +if HAVE_ACL +noinst_LTLIBRARIES += \ + libsystemd-acl.la + +libsystemd_acl_la_SOURCES = \ + src/shared/acl-util.c \ + src/shared/acl-util.h + +libsystemd_acl_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(ACL_CFLAGS) + +libsystemd_acl_la_LIBADD = \ + $(ACL_LIBS) +endif + +# -- +noinst_LTLIBRARIES += \ + libsystemd-label.la + +libsystemd_label_la_SOURCES = \ + src/shared/cgroup-label.c \ + src/shared/socket-label.c \ + src/shared/label.c \ + src/shared/label.h \ + src/shared/mkdir.c \ + src/shared/mkdir.h \ + src/shared/ask-password-api.c \ + src/shared/ask-password-api.h \ + src/shared/dev-setup.c \ + src/shared/dev-setup.h + +libsystemd_label_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(SELINUX_CFLAGS) + +libsystemd_label_la_LIBADD = \ + $(SELINUX_LIBS) + +# -- +noinst_LTLIBRARIES += \ + libsystemd-shared.la + +libsystemd_shared_la_SOURCES = \ + src/shared/linux/auto_dev-ioctl.h \ + src/shared/linux/fanotify.h \ + src/shared/missing.h \ + src/shared/list.h \ + src/shared/macro.h \ + src/shared/def.h \ + src/shared/util.c \ + src/shared/util.h \ + src/shared/virt.c \ + src/shared/virt.h \ + src/shared/path-util.c \ + src/shared/path-util.h \ + src/shared/hashmap.c \ + src/shared/hashmap.h \ + src/shared/set.c \ + src/shared/set.h \ + src/shared/strv.c \ + src/shared/strv.h \ + src/shared/conf-parser.c \ + src/shared/conf-parser.h \ + src/shared/log.c \ + src/shared/log.h \ + src/shared/ratelimit.h \ + src/shared/ratelimit.c \ + src/shared/exit-status.c \ + src/shared/exit-status.h \ + src/shared/utf8.c \ + src/shared/utf8.h \ + src/shared/pager.c \ + src/shared/pager.h \ + src/shared/ioprio.h \ + src/shared/socket-util.c \ + src/shared/socket-util.h \ + src/shared/conf-files.c \ + src/shared/conf-files.h \ + src/shared/cgroup-util.c \ + src/shared/cgroup-util.h \ + src/shared/cgroup-show.c \ + src/shared/cgroup-show.h \ + src/shared/unit-name.c \ + src/shared/unit-name.h \ + src/shared/utmp-wtmp.c \ + src/shared/utmp-wtmp.h \ + src/shared/watchdog.c \ + src/shared/watchdog.h \ + src/shared/spawn-ask-password-agent.c \ + src/shared/spawn-ask-password-agent.h \ + src/shared/specifier.c \ + src/shared/specifier.h \ + src/shared/spawn-polkit-agent.c \ + src/shared/spawn-polkit-agent.h \ + src/shared/hwclock.c \ + src/shared/hwclock.h diff --git a/Makefile.am b/Makefile.am index 98a8506..cadcb6b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -519,64 +519,7 @@ EXTRA_DIST += \ $(MANPAGES) \ $(MANPAGES_ALIAS) -# -- -noinst_LTLIBRARIES += \ - libsystemd-shared.la - -libsystemd_shared_la_SOURCES = \ - src/shared/linux/auto_dev-ioctl.h \ - src/shared/linux/fanotify.h \ - src/shared/missing.h \ - src/shared/list.h \ - src/shared/macro.h \ - src/shared/def.h \ - src/shared/util.c \ - src/shared/util.h \ - src/shared/virt.c \ - src/shared/virt.h \ - src/shared/path-util.c \ - src/shared/path-util.h \ - src/shared/hashmap.c \ - src/shared/hashmap.h \ - src/shared/set.c \ - src/shared/set.h \ - src/shared/strv.c \ - src/shared/strv.h \ -
