chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
util: include `stdarg.h`
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 4e244807c820d2a87eb2b02a8a00f09e2f4e5b39..482d53e7eb0706860b5f7dac7f114dab6fe9d49f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,7 @@ bashcompletiondir=$(sysconfdir)/bash_completion.d
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
 userunitdir=$(prefix)/lib/systemd/user
-tmpfilesdir=$(sysconfdir)/tmpfiles.d
+tmpfilesdir=$(prefix)/lib/tmpfiles.d
 usergeneratordir=$(pkglibexecdir)/user-generators
 
 # And these are the special ones for /
@@ -90,6 +90,18 @@ AM_CPPFLAGS += \
        -DKBD_SETFONT=\"/bin/setfont\" \
        -DDEFAULT_FONT=\"LatArCyrHeb-16\"
 else
+if TARGET_MEEGO
+AM_CPPFLAGS += \
+       -DKBD_LOADKEYS=\"/bin/loadkeys\" \
+       -DKBD_SETFONT=\"/bin/setfont\" \
+       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
+if TARGET_ANGSTROM
+AM_CPPFLAGS += \
+       -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+       -DKBD_SETFONT=\"/usr/bin/setfont\" \
+       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
 AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/bin/loadkeys\" \
        -DKBD_SETFONT=\"/bin/setfont\" \
@@ -98,6 +110,8 @@ endif
 endif
 endif
 endif
+endif
+endif
 
 rootbin_PROGRAMS = \
        systemd \
@@ -144,7 +158,12 @@ rootlibexec_PROGRAMS = \
        systemd-ac-power \
        systemd-detect-virt \
        systemd-sysctl \
+        systemd-hostnamed
+
+if ENABLE_BINFMT
+rootlibexec_PROGRAMS += \
        systemd-binfmt
+endif
 
 systemgenerator_PROGRAMS = \
        systemd-getty-generator
@@ -177,10 +196,12 @@ dist_pkgsysconf_DATA = \
        src/system.conf
 
 dist_dbuspolicy_DATA = \
-       src/org.freedesktop.systemd1.conf
+       src/org.freedesktop.systemd1.conf \
+        src/org.freedesktop.hostname1.conf
 
 dist_dbussystemservice_DATA = \
-       src/org.freedesktop.systemd1.service
+       src/org.freedesktop.systemd1.service \
+        src/org.freedesktop.hostname1.service
 
 dist_udevrules_DATA = \
        src/99-systemd.rules
@@ -232,7 +253,7 @@ dist_systemunit_DATA = \
        units/reboot.target \
        units/rescue.target \
        units/rpcbind.target \
-       units/rtc-set.target \
+       units/time-sync.target \
        units/shutdown.target \
        units/final.target \
        units/umount.target \
@@ -247,8 +268,6 @@ dist_systemunit_DATA = \
        units/dev-hugepages.mount \
        units/dev-mqueue.automount \
        units/dev-mqueue.mount \
-       units/proc-sys-fs-binfmt_misc.automount \
-       units/proc-sys-fs-binfmt_misc.mount \
        units/sys-kernel-debug.automount \
        units/sys-kernel-debug.mount \
        units/sys-kernel-security.automount \
@@ -274,6 +293,11 @@ dist_systemunit_DATA += \
        units/var-lock.mount
 endif
 
+if ENABLE_BINFMT
+dist_systemunit_DATA += \
+       units/proc-sys-fs-binfmt_misc.automount \
+       units/proc-sys-fs-binfmt_misc.mount
+endif
 
 nodist_systemunit_DATA = \
        units/getty@.service \
@@ -283,6 +307,7 @@ nodist_systemunit_DATA = \
        units/systemd-initctl.service \
        units/systemd-logger.service \
        units/systemd-shutdownd.service \
+       units/systemd-hostnamed.service \
        units/systemd-kmsg-syslogd.service \
        units/systemd-modules-load.service \
        units/systemd-vconsole-setup.service \
@@ -300,7 +325,6 @@ nodist_systemunit_DATA = \
        units/systemd-ask-password-wall.service \
        units/systemd-ask-password-console.service \
        units/systemd-sysctl.service \
-       units/systemd-binfmt.service \
        units/halt.service \
        units/poweroff.service \
        units/reboot.service \
@@ -310,6 +334,11 @@ nodist_systemunit_DATA = \
        units/quotacheck.service \
        units/rescue.service
 
+if ENABLE_BINFMT
+nodist_systemunit_DATA += \
+       units/systemd-binfmt.service
+endif
+
 dist_userunit_DATA = \
        units/user/default.target \
        units/user/exit.target
@@ -327,6 +356,7 @@ EXTRA_DIST = \
        units/systemd-initctl.service.in \
        units/systemd-logger.service.in \
        units/systemd-shutdownd.service.in \
+       units/systemd-hostnamed.service.in \
        units/systemd-kmsg-syslogd.service.in \
        units/systemd-modules-load.service.in \
        units/systemd-vconsole-setup.service.in \
@@ -344,7 +374,6 @@ EXTRA_DIST = \
        units/systemd-ask-password-wall.service.in \
        units/systemd-ask-password-console.service.in \
        units/systemd-sysctl.service.in \
-       units/systemd-binfmt.service.in \
        units/halt.service.in \
        units/poweroff.service.in \
        units/reboot.service.in \
@@ -357,6 +386,11 @@ EXTRA_DIST = \
        introspect.awk \
        src/org.freedesktop.systemd1.policy.in
 
+if ENABLE_BINFMT
+EXTRA_DIST += \
+       units/systemd-binfmt.service.in
+endif
+
 if TARGET_FEDORA
 dist_systemunit_DATA += \
        units/fedora/prefdm.service \
@@ -407,9 +441,12 @@ dist_doc_DATA = \
 pkgconfigdata_DATA = \
        systemd.pc
 
-polkitpolicy_DATA = \
+nodist_polkitpolicy_DATA = \
        src/org.freedesktop.systemd1.policy
 
+dist_polkitpolicy_DATA = \
+        src/org.freedesktop.hostname1.policy
+
 noinst_LTLIBRARIES = \
        libsystemd-basic.la \
        libsystemd-core.la \
@@ -482,7 +519,8 @@ libsystemd_core_la_SOURCES = \
        src/namespace.c \
        src/tcpwrap.c \
        src/cgroup-util.c \
-       src/condition.c
+       src/condition.c \
+        src/dbus-common.c
 
 libsystemd_core_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -571,9 +609,15 @@ MANPAGES = \
        man/vconsole.conf.5 \
        man/locale.conf.5 \
        man/os-release.5 \
+        man/machine-info.5 \
        man/modules-load.d.5 \
-       man/binfmt.d.5 \
-       man/sysctl.d.5
+       man/sysctl.d.5 \
+        man/systemd-ask-password.1
+
+if ENABLE_BINFMT
+MANPAGES += \
+       man/binfmt.d.5
+endif
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
@@ -753,6 +797,19 @@ systemd_shutdownd_LDADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la
 
+systemd_hostnamed_SOURCES = \
+       src/hostnamed.c \
+        src/dbus-common.c
+
+systemd_hostnamed_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+systemd_hostnamed_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       $(DBUS_LIBS)
+
 systemd_shutdown_SOURCES = \
        src/mount-setup.c \
        src/umount.c \
@@ -1256,12 +1313,19 @@ CLEANFILES += \
 install-data-hook:
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(tmpfilesdir) \
+               $(DESTDIR)$(sysconfdir)/tmpfiles.d \
+               $(DESTDIR)$(prefix)/lib/modules-load.d \
                $(DESTDIR)$(sysconfdir)/modules-load.d \
+               $(DESTDIR)$(prefix)/lib/sysctl.d \
                $(DESTDIR)$(sysconfdir)/sysctl.d \
-               $(DESTDIR)$(sysconfdir)/binfmt.d \
                $(DESTDIR)$(systemshutdowndir) \
                $(DESTDIR)$(systemgeneratordir) \
                $(DESTDIR)$(usergeneratordir)
+if ENABLE_BINFMT
+       $(MKDIR_P) -m 0755 \
+               $(DESTDIR)$(prefix)/lib/binfmt.d \
+               $(DESTDIR)$(sysconfdir)/binfmt.d
+endif
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(systemunitdir) \
                $(DESTDIR)$(userunitdir) \
@@ -1320,13 +1384,11 @@ install-data-hook:
                        fsck-root.service \
                        remount-rootfs.service \
                        var-run.mount \
-                       var-lock.mount \
                        media.mount && \
                $(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
                $(LN_S) ../fsck-root.service fsck-root.service && \
                $(LN_S) ../remount-rootfs.service remount-rootfs.service && \
                $(LN_S) ../var-run.mount var-run.mount && \
-               $(LN_S) ../var-lock.mount var-lock.mount && \
                $(LN_S) ../media.mount media.mount )
        ( cd $(DESTDIR)$(userunitdir) && \
                rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target sound.target && \
@@ -1347,9 +1409,10 @@ install-data-hook:
                $(LN_S) graphical.target runlevel5.target && \
                $(LN_S) reboot.target runlevel6.target )
        ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f default.target ctrl-alt-del.target && \
+               rm -f default.target ctrl-alt-del.target dbus-org.freedesktop.hostname1.service && \
                $(LN_S) graphical.target default.target && \
-               $(LN_S) reboot.target ctrl-alt-del.target )
+               $(LN_S) reboot.target ctrl-alt-del.target && \
+                $(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service )
        ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
                rm -f getty.target systemd-user-sessions.service systemd-ask-password-wall.path && \
                $(LN_S) ../getty.target getty.target && \
@@ -1372,7 +1435,6 @@ install-data-hook:
        ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
                rm -f dev-hugepages.automount \
                        dev-mqueue.automount \
-                       proc-sys-fs-binfmt_misc.automount \
                        sys-kernel-debug.automount \
                        sys-kernel-security.automount \
                        systemd-vconsole-setup.service \
@@ -1380,13 +1442,11 @@ install-data-hook:
                        systemd-random-seed-load.service \
                        systemd-tmpfiles-setup.service \
                        systemd-sysctl.service \
-                       systemd-binfmt.service \
                        systemd-ask-password-console.path \
                        systemd-kmsg-syslogd.service \
                        cryptsetup.target && \
                $(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
                $(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
-               $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
                $(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \
                $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount && \
                $(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service && \
@@ -1394,10 +1454,16 @@ install-data-hook:
                $(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
                $(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
                $(LN_S) ../systemd-sysctl.service systemd-sysctl.service && \
-               $(LN_S) ../systemd-binfmt.service systemd-binfmt.service && \
                $(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path && \
                $(LN_S) ../systemd-kmsg-syslogd.service && \
                $(LN_S) ../cryptsetup.target cryptsetup.target )
+if ENABLE_BINFMT
+       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+               rm -f systemd-binfmt.service \
+                       proc-sys-fs-binfmt_misc.automount && \
+               $(LN_S) ../systemd-binfmt.service systemd-binfmt.service && \
+               $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount )
+endif
        ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
                rm -f systemd-tmpfiles-clean.timer && \
                $(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
@@ -1432,6 +1498,20 @@ if HAVE_PLYMOUTH
                rm -f plymouth-halt.service && \
                $(LN_S) ../plymouth-halt.service plymouth-halt.service )
 endif
+if TARGET_MEEGO
+       $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
+       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+               rm -f network.target && \
+               $(LN_S) $(systemunitdir)/network.target network.target )
+       ( cd $(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants && \
+               rm -f * )
+       ( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \
+               rm -f * )
+       ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
+               rm -f * )
+       ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
+               rm -f * )
+endif
 
 if TARGET_FEDORA
        $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
@@ -1474,6 +1554,12 @@ if TARGET_DEBIAN_OR_UBUNTU
                $(LN_S) multi-user.target runlevel5.target )
 endif
 
+if HAVE_SYSV_COMPAT
+       ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
+               rm -f var-lock.mount && \
+               $(LN_S) ../var-lock.mount var-lock.mount )
+endif
+
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
        --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
Unnamed repository; edit this file 'description' to name the repository.