chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
udev: libudev - bump soname, remove deprecated functions, introduce symbol versions
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index ab7fca677a5165f0d91f257d7858be9e2b55a7a5..7c1b4310938a4e998df5ee6af1f8287dc1d7f02b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,9 +23,9 @@ AM_MAKEFLAGS = --no-print-directory
 
 SUBDIRS = . po
 
-LIBUDEV_CURRENT=13
-LIBUDEV_REVISION=3
-LIBUDEV_AGE=13
+LIBUDEV_CURRENT=1
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=0
 
 LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=1
@@ -67,6 +67,7 @@ usergeneratordir=$(pkglibexecdir)/user-generators
 pkgincludedir=$(includedir)/systemd
 systemgeneratordir=$(rootlibexecdir)/system-generators
 systemshutdowndir=$(rootlibexecdir)/system-shutdown
+systemsleepdir=$(rootlibexecdir)/system-sleep
 systemunitdir=$(rootprefix)/lib/systemd/system
 udevlibexecdir=$(rootprefix)/lib/udev
 udevhomedir = $(libexecdir)/udev
@@ -117,6 +118,7 @@ AM_CPPFLAGS = \
        -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
        -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
        -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
+       -DSYSTEMD_SLEEP_BINARY_PATH=\"$(rootlibexecdir)/systemd-sleep\" \
        -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\" \
@@ -225,12 +227,13 @@ rootlibexec_PROGRAMS = \
        systemd-shutdownd \
        systemd-shutdown \
        systemd-modules-load \
-       systemd-remount-api-vfs \
+       systemd-remount-fs \
        systemd-reply-password \
        systemd-fsck \
        systemd-timestamp \
        systemd-ac-power \
-       systemd-sysctl
+       systemd-sysctl \
+       systemd-sleep
 
 systemgenerator_PROGRAMS = \
        systemd-getty-generator
@@ -266,6 +269,7 @@ dist_systemunit_DATA = \
        units/nss-lookup.target \
        units/nss-user-lookup.target \
        units/mail-transfer-agent.target \
+       units/hibernate.target \
        units/http-daemon.target \
        units/poweroff.target \
        units/reboot.target \
@@ -276,7 +280,9 @@ dist_systemunit_DATA = \
        units/final.target \
        units/umount.target \
        units/sigpwr.target \
+       units/sleep.target \
        units/sockets.target \
+       units/suspend.target \
        units/swap.target \
        units/systemd-initctl.socket \
        units/systemd-shutdownd.socket \
@@ -287,7 +293,6 @@ dist_systemunit_DATA = \
        units/sys-kernel-debug.mount \
        units/sys-fs-fuse-connections.mount \
        units/tmp.mount \
-       units/remount-rootfs.service \
        units/printer.target \
        units/sound.target \
        units/bluetooth.target \
@@ -298,7 +303,8 @@ dist_systemunit_DATA = \
        units/systemd-ask-password-console.path \
        units/syslog.target \
        units/systemd-udev-control.socket \
-       units/systemd-udev-kernel.socket
+       units/systemd-udev-kernel.socket \
+       units/systemd-timedated-ntp.target
 
 nodist_systemunit_DATA = \
        units/getty@.service \
@@ -308,7 +314,7 @@ nodist_systemunit_DATA = \
        units/systemd-initctl.service \
        units/systemd-shutdownd.service \
        units/systemd-modules-load.service \
-       units/systemd-remount-api-vfs.service \
+       units/systemd-remount-fs.service \
        units/systemd-update-utmp-runlevel.service \
        units/systemd-update-utmp-shutdown.service \
        units/systemd-tmpfiles-setup.service \
@@ -318,12 +324,14 @@ nodist_systemunit_DATA = \
        units/systemd-sysctl.service \
        units/halt.service \
        units/emergency.service \
+       units/hibernate.service \
        units/poweroff.service \
        units/reboot.service \
        units/kexec.service \
        units/fsck@.service \
        units/fsck-root.service \
        units/rescue.service \
+       units/suspend.service \
        units/user@.service \
        units/systemd-udev.service \
        units/systemd-udev-trigger.service \
@@ -345,7 +353,7 @@ EXTRA_DIST += \
        units/systemd-initctl.service.in \
        units/systemd-shutdownd.service.in \
        units/systemd-modules-load.service.in \
-       units/systemd-remount-api-vfs.service.in \
+       units/systemd-remount-fs.service.in \
        units/systemd-update-utmp-runlevel.service.in \
        units/systemd-update-utmp-shutdown.service.in \
        units/systemd-tmpfiles-setup.service.in \
@@ -365,6 +373,8 @@ EXTRA_DIST += \
        units/systemd-udev.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service \
+       units/hibernate.service.in \
+       units/suspend.service.in \
        introspect.awk \
        man/custom-html.xsl
 
@@ -481,7 +491,8 @@ MANPAGES = \
        man/systemd-machine-id-setup.1 \
        man/systemd-detect-virt.1 \
        man/journald.conf.5 \
-       man/journalctl.1
+       man/journalctl.1 \
+       man/systemd-inhibit.1
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
@@ -525,6 +536,8 @@ libsystemd_shared_la_SOURCES = \
        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 \
@@ -546,6 +559,8 @@ libsystemd_shared_la_SOURCES = \
        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 \
@@ -561,11 +576,9 @@ libsystemd_shared_la_SOURCES = \
        src/shared/specifier.c \
        src/shared/specifier.h \
        src/shared/spawn-polkit-agent.c \
-       src/shared/spawn-polkit-agent.h
-
-libsystemd_shared_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
+       src/shared/spawn-polkit-agent.h \
+       src/shared/hwclock.c \
+       src/shared/hwclock.h
 
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -904,7 +917,8 @@ test_job_type_CFLAGS = \
        $(DBUS_CFLAGS)
 
 test_job_type_LDADD = \
-       libsystemd-core.la
+       libsystemd-core.la \
+       libsystemd-daemon.la
 
 test_ns_SOURCES = \
        src/test/test-ns.c
@@ -1058,6 +1072,13 @@ systemd_sysctl_SOURCES = \
 systemd_sysctl_LDADD = \
        libsystemd-shared.la
 
+# ------------------------------------------------------------------------------
+systemd_sleep_SOURCES = \
+       src/sleep/sleep.c
+
+systemd_sleep_LDADD = \
+       libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 systemd_fsck_SOURCES = \
        src/fsck/fsck.c
@@ -1110,12 +1131,12 @@ systemd_rc_local_generator_LDADD = \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
-systemd_remount_api_vfs_SOURCES = \
-       src/remount-api-vfs/remount-api-vfs.c \
+systemd_remount_fs_SOURCES = \
+       src/remount-fs/remount-fs.c \
        src/core/mount-setup.c \
        src/core/mount-setup.h
 
-systemd_remount_api_vfs_LDADD = \
+systemd_remount_fs_LDADD = \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1309,7 +1330,8 @@ libudev_la_CFLAGS = \
 
 libudev_la_LDFLAGS = \
        $(AM_LDFLAGS) \
-       -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
+       -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \
+       -Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym
 
 libudev_la_LIBADD = \
        libsystemd-shared.la
@@ -1318,7 +1340,8 @@ pkgconfiglib_DATA += \
        src/libudev/libudev.pc
 
 EXTRA_DIST += \
-       src/libudev/libudev.pc.in
+       src/libudev/libudev.pc.in \
+       src/libudev/libudev.sym
 
 CLEANFILES += \
        src/libudev/libudev.pc
@@ -2665,6 +2688,20 @@ loginctl_LDADD = \
 rootbin_PROGRAMS += \
        loginctl
 
+systemd_inhibit_SOURCES = \
+       src/login/inhibit.c
+
+systemd_inhibit_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+systemd_inhibit_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-dbus.la
+
+rootbin_PROGRAMS += \
+       systemd-inhibit
+
 test_login_SOURCES = \
        src/login/test-login.c
 
@@ -2888,6 +2925,7 @@ SED_PROCESS = \
                -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
                -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
                -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
+               -e 's,@RANDOM_SEED\@,$(localstatedir)/lib/random-seed,g' \
                -e 's,@prefix\@,$(prefix),g' \
                -e 's,@exec_prefix\@,$(exec_prefix),g' \
                -e 's,@libdir\@,$(libdir),g' \
@@ -3008,6 +3046,7 @@ systemd-install-data-hook:
                $(DESTDIR)$(prefix)/lib/sysctl.d \
                $(DESTDIR)$(sysconfdir)/sysctl.d \
                $(DESTDIR)$(systemshutdowndir) \
+               $(DESTDIR)$(systemsleepdir) \
                $(DESTDIR)$(systemgeneratordir) \
                $(DESTDIR)$(usergeneratordir)
        $(MKDIR_P) -m 0755 \
@@ -3059,13 +3098,11 @@ systemd-install-data-hook:
                rm -f systemd-update-utmp-shutdown.service && \
                $(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service )
        ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
-               rm -f systemd-remount-api-vfs.service \
+               rm -f systemd-remount-fs.service \
                        fsck-root.service \
-                       remount-rootfs.service \
                        tmp.mount && \
-               $(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
+               $(LN_S) ../systemd-remount-fs.service systemd-remount-fs.service && \
                $(LN_S) ../fsck-root.service fsck-root.service && \
-               $(LN_S) ../remount-rootfs.service remount-rootfs.service && \
                $(LN_S) ../tmp.mount tmp.mount )
        ( cd $(DESTDIR)$(userunitdir) && \
                rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target && \
@@ -3166,10 +3203,6 @@ if TARGET_MEEGO
 endif
 
 if TARGET_FEDORA
-       $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-       ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
-               rm -f halt-local.service && \
-               $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f display-manager.service single.service && \
                $(LN_S) prefdm.service display-manager.service && \
@@ -3180,10 +3213,6 @@ if TARGET_FEDORA
 endif
 
 if TARGET_MANDRIVA
-       $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-       ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
-               rm -f halt-local.service && \
-               $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f display-manager.service dm.service single.service && \
                $(LN_S) prefdm.service display-manager.service && \
@@ -3201,20 +3230,12 @@ if TARGET_DEBIAN_OR_UBUNTU
 endif
 
 if TARGET_SUSE
-       $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f local.service && \
                $(LN_S) rc-local.service local.service )
-       ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
-               rm -f halt-local.service && \
-               $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
 endif
 
 if TARGET_MAGEIA
-       $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-       ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
-               rm -f halt-local.service && \
-               $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f display-manager.service && \
                $(LN_S) prefdm.service display-manager.service && \
Unnamed repository; edit this file 'description' to name the repository.