chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
headers: fix git URLs for source files
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 7962db032f8ff194bf883d95471c281d03a6cc6b..edcb96182828448e5475620b0fc1ce4656562388 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,12 +56,12 @@ usergeneratordir=$(pkglibexecdir)/user-generators
 pkgincludedir=$(includedir)/systemd
 
 # And these are the special ones for /
-rootdir=@rootdir@
-rootbindir=$(rootdir)/bin
-rootlibexecdir=$(rootdir)/lib/systemd
+rootprefix=@rootprefix@
+rootbindir=$(rootprefix)/bin
+rootlibexecdir=$(rootprefix)/lib/systemd
 systemgeneratordir=$(rootlibexecdir)/system-generators
 systemshutdowndir=$(rootlibexecdir)/system-shutdown
-systemunitdir=$(rootdir)/lib/systemd/system
+systemunitdir=$(rootprefix)/lib/systemd/system
 
 CLEANFILES =
 EXTRA_DIST =
@@ -89,6 +89,7 @@ AM_CPPFLAGS = \
        -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
        -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
        -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
+       -DROOTPREFIX=\"$(rootprefix)\" \
        -DRUNTIME_DIR=\"/run\" \
        -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
        -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
@@ -99,7 +100,8 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src \
        -I $(top_srcdir)/src/readahead \
        -I $(top_srcdir)/src/login \
-       -I $(top_srcdir)/src/journal
+       -I $(top_srcdir)/src/journal \
+       -I $(top_srcdir)/src/systemd
 
 if TARGET_GENTOO
 AM_CPPFLAGS += \
@@ -567,8 +569,68 @@ libsystemd_core_la_LIBADD = \
 # list the .h files as dependencies if we want make dist to work.
 
 EXTRA_DIST += \
-       ${libsystemd_basic_la_SOURCES:.c=.h} \
-       ${libsystemd_core_la_SOURCES:.c=.h} \
+       src/util.h \
+       src/virt.h \
+       src/label.h \
+       src/hashmap.h \
+       src/set.h \
+       src/strv.h \
+       src/conf-parser.h \
+       src/socket-util.h \
+       src/log.h \
+       src/ratelimit.h \
+       src/exit-status.h \
+       src/unit.h \
+       src/job.h \
+       src/manager.h \
+       src/path-lookup.h \
+       src/load-fragment.h \
+       src/service.h \
+       src/automount.h \
+       src/mount.h \
+       src/swap.h \
+       src/device.h \
+       src/target.h \
+       src/snapshot.h \
+       src/socket.h \
+       src/timer.h \
+       src/path.h \
+       src/load-dropin.h \
+       src/execute.h \
+       src/utmp-wtmp.h \
+       src/dbus.h \
+       src/dbus-manager.h \
+       src/dbus-unit.h \
+       src/dbus-job.h \
+       src/dbus-service.h \
+       src/dbus-socket.h \
+       src/dbus-timer.h \
+       src/dbus-target.h \
+       src/dbus-mount.h \
+       src/dbus-automount.h \
+       src/dbus-swap.h \
+       src/dbus-snapshot.h \
+       src/dbus-device.h \
+       src/dbus-execute.h \
+       src/dbus-path.h \
+       src/cgroup.h \
+       src/mount-setup.h \
+       src/hostname-setup.h \
+       src/selinux-setup.h \
+       src/loopback-setup.h \
+       src/kmod-setup.h \
+       src/locale-setup.h \
+       src/machine-id-setup.h \
+       src/specifier.h \
+       src/unit-name.h \
+       src/fdset.h \
+       src/namespace.h \
+       src/tcpwrap.h \
+       src/cgroup-util.h \
+       src/condition.h \
+       src/dbus-common.h \
+       src/install.h \
+       src/cgroup-attr.h \
        src/macro.h \
        src/def.h \
        src/ioprio.h \
@@ -591,7 +653,8 @@ EXTRA_DIST += \
        src/polkit.h \
        src/dbus-loop.h \
        src/spawn-agent.h \
-       src/acl-util.h
+       src/acl-util.h \
+       src/logs-show.h
 
 MANPAGES = \
        man/systemd.1 \
@@ -925,7 +988,7 @@ systemctl_SOURCES = \
        src/pager.c \
        src/install.c \
        src/spawn-agent.c \
-        src/logs-show.c
+       src/logs-show.c
 
 systemctl_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1051,7 +1114,7 @@ libsystemd_daemon_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym
 
 pkginclude_HEADERS += \
-       src/sd-daemon.h
+       src/systemd/sd-daemon.h
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-daemon-install-hook:
@@ -1129,7 +1192,7 @@ noinst_PROGRAMS += \
        test-id128
 
 pkginclude_HEADERS += \
-       src/sd-id128.h
+       src/systemd/sd-id128.h
 
 lib_LTLIBRARIES += \
        libsystemd-id128.la
@@ -1171,6 +1234,9 @@ systemd_journald_SOURCES = \
        src/acl-util.c \
        src/cgroup-util.c
 
+nodist_systemd_journald_SOURCES = \
+       src/journal/journald-gperf.c
+
 systemd_journald_CFLAGS = \
        $(AM_CFLAGS) \
        $(ACL_CFLAGS)
@@ -1193,17 +1259,17 @@ endif
 systemd_journalctl_SOURCES = \
        src/journal/journalctl.c \
        src/pager.c \
-        src/logs-show.c
+       src/logs-show.c
 
 systemd_journalctl_LDADD = \
        libsystemd-basic.la \
-        libsystemd-journal.la
+       libsystemd-journal.la
 
 if HAVE_XZ
 systemd_journalctl_SOURCES += \
        src/journal/compress.c
 systemd_journalctl_CFLAGS = \
-        $(AM_CFLAGS) \
+       $(AM_CFLAGS) \
        $(XZ_CFLAGS)
 systemd_journalctl_LDADD += \
        $(XZ_LIBS)
@@ -1225,7 +1291,7 @@ test_journal_SOURCES += \
        src/journal/compress.c
 
 test_journal_CFLAGS = \
-        $(AM_CFLAGS) \
+       $(AM_CFLAGS) \
        $(XZ_CFLAGS)
 
 test_journal_LDADD += \
@@ -1285,7 +1351,8 @@ noinst_PROGRAMS += \
        test-journal
 
 pkginclude_HEADERS += \
-       src/journal/sd-journal.h
+       src/systemd/sd-journal.h \
+        src/systemd/sd-messages.h
 
 lib_LTLIBRARIES += \
        libsystemd-journal.la
@@ -1302,10 +1369,15 @@ dist_systemunit_DATA += \
 nodist_systemunit_DATA += \
        units/systemd-journald.service
 
+dist_pkgsysconf_DATA += \
+       src/journal/systemd-journald.conf
+
 pkgconfiglib_DATA += \
        src/journal/libsystemd-journal.pc
 
 journal-install-data-hook:
+       $(MKDIR_P) -m 0755 \
+               $(DESTDIR)$(systemunitdir)/sockets.target.wants
        ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
                rm -f systemd-journald.socket && \
                $(LN_S) ../systemd-journald.socket )
@@ -1314,6 +1386,7 @@ INSTALL_DATA_HOOKS += \
        journal-install-data-hook
 
 EXTRA_DIST += \
+       src/journal/journald.h \
        src/journal/journal-def.h \
        src/journal/journal-internal.h \
        src/journal/journal-file.h \
@@ -1322,7 +1395,11 @@ EXTRA_DIST += \
        src/journal/journal-rate-limit.h \
        src/journal/libsystemd-journal.pc.in \
        src/journal/libsystemd-journal.sym \
-       units/systemd-journald.service.in
+       units/systemd-journald.service.in \
+       src/journal/journald-gperf.gperf
+
+CLEANFILES += \
+       src/journal/journald-gperf.c
 
 # ------------------------------------------------------------------------------
 if ENABLE_BINFMT
@@ -1345,7 +1422,8 @@ nodist_systemunit_DATA += \
 binfmt-install-data-hook:
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(prefix)/lib/binfmt.d \
-               $(DESTDIR)$(sysconfdir)/binfmt.d
+               $(DESTDIR)$(sysconfdir)/binfmt.d \
+               $(DESTDIR)$(systemunitdir)/sysinit.target.wants
        ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
                rm -f systemd-binfmt.service \
                        proc-sys-fs-binfmt_misc.automount && \
@@ -1377,6 +1455,8 @@ nodist_systemunit_DATA += \
        units/systemd-vconsole-setup.service
 
 vconsole-install-data-hook:
+       $(MKDIR_P) -m 0755 \
+               $(DESTDIR)$(systemunitdir)/sysinit.target.wants
        ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
                rm -f systemd-vconsole-setup.service && \
                $(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service )
@@ -1432,7 +1512,7 @@ nodist_systemunit_DATA += \
        units/systemd-readahead-done.service
 
 EXTRA_DIST += \
-       src/readahead/sd-readahead.h \
+       src/systemd/sd-readahead.h \
        src/readahead/readahead-common.h \
        units/systemd-readahead-collect.service.in \
        units/systemd-readahead-replay.service.in \
@@ -1481,6 +1561,9 @@ systemd_random_seed_LDADD = \
        libsystemd-basic.la
 
 randomseed-install-data-hook:
+       $(MKDIR_P) -m 0755 \
+               $(DESTDIR)$(systemunitdir)/shutdown.target.wants \
+               $(DESTDIR)$(systemunitdir)/sysinit.target.wants
        ( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
                rm -f systemd-random-seed-save.service && \
                $(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service )
@@ -1525,6 +1608,8 @@ systemd_cryptsetup_generator_LDADD = \
        libsystemd-basic.la
 
 cryptsetup-install-data-hook:
+       $(MKDIR_P) -m 0755 \
+               $(DESTDIR)$(systemunitdir)/sysinit.target.wants
        ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
                rm -f cryptsetup.target && \
                $(LN_S) ../cryptsetup.target cryptsetup.target )
@@ -1854,7 +1939,7 @@ dist_pkgsysconf_DATA += \
        src/login/systemd-logind.conf
 
 pkginclude_HEADERS += \
-       src/login/sd-login.h
+       src/systemd/sd-login.h
 
 lib_LTLIBRARIES += \
        libsystemd-login.la
@@ -1866,6 +1951,8 @@ polkitpolicy_in_files += \
        src/login/org.freedesktop.login1.policy.in
 
 logind-install-data-hook:
+       $(MKDIR_P) -m 0755 \
+               $(DESTDIR)$(systemunitdir)/multi-user.target.wants
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f dbus-org.freedesktop.login1.service && \
                $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
@@ -2374,7 +2461,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
        --with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
-       --with-rootdir=$$dc_install_base/$(rootdir)
+       --with-rootprefix=$$dc_install_base/$(rootprefix)
 
 upload: all distcheck
        cp -v systemd-$(VERSION).tar.bz2 /home/lennart/git.fedora/systemd/
Unnamed repository; edit this file 'description' to name the repository.