NEWS: fix typo

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3eafcff4bef33629731bff1286b1b73de78123bc..affd16afbd3855fa5d6900c97fae33fab43d19ae 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,7 +60,7 @@ LIBSYSTEMD_JOURNAL_REVISION=5
 LIBSYSTEMD_JOURNAL_AGE=11
 
 LIBSYSTEMD_CURRENT=0
-LIBSYSTEMD_REVISION=1
+LIBSYSTEMD_REVISION=2
 LIBSYSTEMD_AGE=0
 
 # Dirs of external packages
@@ -208,6 +208,7 @@ define move-to-rootlibdir
                $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
                so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
                so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+               rm -f $(DESTDIR)$(libdir)/$$libname && \
                $(LN_S) --relative -f $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
                mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
        fi
@@ -311,6 +312,10 @@ AM_V_LN = $(AM_V_LN_$(V))
 AM_V_LN_ = $(AM_V_LN_$(AM_DEFAULT_VERBOSITY))
 AM_V_LN_0 = @echo "  LN      " $@;
 
+AM_V_RM = $(AM_V_RM_$(V))
+AM_V_RM_ = $(AM_V_RM_$(AM_DEFAULT_VERBOSITY))
+AM_V_RM_0 = @echo "  RM      " $@;
+
 # ------------------------------------------------------------------------------
 rootbin_PROGRAMS = \
        systemctl \
@@ -361,9 +366,11 @@ dist_bashcompletion_DATA = \
        shell-completion/bash/journalctl \
        shell-completion/bash/systemctl \
        shell-completion/bash/systemd-analyze \
+       shell-completion/bash/systemd-cat \
        shell-completion/bash/systemd-cgls \
        shell-completion/bash/systemd-cgtop \
        shell-completion/bash/systemd-delta \
+       shell-completion/bash/systemd-detect-virt \
        shell-completion/bash/systemd-nspawn \
        shell-completion/bash/systemd-run \
        shell-completion/bash/udevadm \
@@ -785,7 +792,10 @@ libsystemd_shared_la_SOURCES = \
        src/shared/condition-util.c \
        src/shared/condition-util.h \
        src/shared/bus-label.c \
-       src/shared/bus-label.h
+       src/shared/bus-label.h \
+       src/shared/gpt.h \
+       src/shared/generator.h \
+       src/shared/generator.c
 
 nodist_libsystemd_shared_la_SOURCES = \
        src/shared/errno-from-name.h \
@@ -1018,7 +1028,9 @@ libsystemd_core_la_SOURCES = \
        src/core/audit-fd.c \
        src/core/audit-fd.h \
        src/core/async.c \
-       src/core/async.h
+       src/core/async.h \
+       src/core/show-status.c \
+       src/core/show-status.h
 
 if HAVE_KMOD
 libsystemd_core_la_SOURCES += \
@@ -1827,7 +1839,8 @@ systemgenerator_PROGRAMS +=  \
        systemd-gpt-auto-generator
 
 systemd_gpt_auto_generator_SOURCES = \
-       src/gpt-auto-generator/gpt-auto-generator.c
+       src/gpt-auto-generator/gpt-auto-generator.c \
+       src/shared/blkid-util.h
 
 systemd_gpt_auto_generator_LDADD = \
        libsystemd-label.la \
@@ -1856,6 +1869,7 @@ systemd_dbus1_generator_LDADD = \
 
 dbus1-generator-install-hook:
        $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
+       $(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
        $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
 
 dbus1-generator-uninstall-hook:
@@ -1951,14 +1965,16 @@ systemd_nspawn_SOURCES = \
 
 systemd_nspawn_CFLAGS = \
        $(AM_CFLAGS) \
-       $(SECCOMP_CFLAGS)
+       $(SECCOMP_CFLAGS) \
+       $(BLKID_CFLAGS)
 
 systemd_nspawn_LDADD = \
        libsystemd-label.la \
        libsystemd-capability.la \
        libsystemd-internal.la \
        libudev-internal.la \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       $(BLKID_LIBS)
 
 if HAVE_SECCOMP
 systemd_nspawn_LDADD += \
@@ -1986,6 +2002,7 @@ systemd_bus_proxyd_LDADD = \
 
 bus-proxyd-install-hook:
        $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir)
+       $(AM_V_RM)rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge
        $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(rootlibexecdir)/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge
 
 bus-proxyd-uninstall-hook:
@@ -2419,6 +2436,7 @@ libsystemd_network_la_SOURCES = \
        src/systemd/sd-network.h \
        src/systemd/sd-dhcp-client.h \
        src/systemd/sd-dhcp-lease.h \
+       src/systemd/sd-ipv4ll.h \
        src/network/sd-network.c \
        src/network/network-util.h \
        src/libsystemd-network/sd-dhcp-client.c \
@@ -2428,7 +2446,11 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/dhcp-internal.h \
        src/libsystemd-network/dhcp-protocol.h \
        src/libsystemd-network/dhcp-lease-internal.h \
-       src/libsystemd-network/sd-dhcp-lease.c
+       src/libsystemd-network/sd-dhcp-lease.c \
+       src/libsystemd-network/sd-ipv4ll.c \
+       src/libsystemd-network/ipv4ll-network.c \
+       src/libsystemd-network/ipv4ll-packet.c \
+       src/libsystemd-network/ipv4ll-internal.h
 
 libsystemd_network_la_LIBADD = \
        libsystemd-internal.la \
@@ -2553,7 +2575,6 @@ dist_network_DATA = \
        network/80-container-host0.network
 
 dist_udevrules_DATA += \
-       rules/99-systemd.rules \
        rules/42-usb-hid-pm.rules \
        rules/50-udev-default.rules \
        rules/60-drm.rules \
@@ -2570,6 +2591,9 @@ dist_udevrules_DATA += \
        rules/80-net-setup-link.rules \
        rules/95-udev-late.rules
 
+nodist_udevrules_DATA += \
+       rules/99-systemd.rules
+
 dist_udevhwdb_DATA = \
        hwdb/20-pci-vendor-model.hwdb \
        hwdb/20-pci-classes.hwdb \
@@ -4939,7 +4963,7 @@ kdbus-update:
        wget -N https://d-bus.googlecode.com/git/kdbus.h )
 
 .PHONY: upload
-upload: all distcheck
+upload: all check
        cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
        scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
        scp man/*.html tango:public/systemd-man/
@@ -4956,7 +4980,7 @@ doc-sync: all destdir-sphinx
 
 .PHONY: git-tag
 git-tag:
-       git tag "v$(VERSION)" -m "systemd $(VERSION)"
+       git tag -s "v$(VERSION)" -m "systemd $(VERSION)"
 
 .PHONY: install-tree
 install-tree: all