update fixme

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index eb911fc89612367361ab46ba216fa0578a30d79a..115197e6c736fc3592256826d899a66f69d107cb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,7 +58,8 @@ rootbin_PROGRAMS = \
        systemd-notify
 
 bin_PROGRAMS = \
-       systemd-install
+       systemd-install \
+       systemd-cgls
 
 if HAVE_GTK
 bin_PROGRAMS += \
@@ -320,6 +321,7 @@ MANPAGES = \
        man/systemctl.1 \
        man/systemadm.1 \
        man/systemd-install.1 \
+       man/systemd-cgls.1 \
        man/systemd-notify.1 \
        man/sd_notify.3 \
        man/sd_booted.3 \
@@ -501,7 +503,8 @@ systemd_notify_LDADD = \
 systemd_install_SOURCES = \
        src/install.c \
        src/path-lookup.c \
-       src/dbus-common.c
+       src/dbus-common.c \
+       src/sd-daemon.c
 
 systemd_install_LDADD = \
        libsystemd-basic.la \
@@ -511,6 +514,16 @@ systemd_install_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS)
 
+systemd_cgls_SOURCES = \
+       src/systemd-cgls.c \
+       src/cgroup-show.c
+
+systemd_cgls_LDADD = \
+       libsystemd-basic.la
+
+systemd_cgls_CFLAGS = \
+       $(AM_CFLAGS)
+
 systemadm_SOURCES = \
        src/systemadm.vala \
        src/systemd-interfaces.vala
@@ -673,7 +686,7 @@ CLEANFILES += \
 endif
 
 org.freedesktop.systemd1.%.xml: systemd
-       $(AM_V_GEN)./systemd --introspect=${@:.xml=} > $@
+       $(AM_V_GEN)SYSTEMD_SKIP_API_MOUNTS=1 ./systemd --introspect=${@:.xml=} > $@
 
 CLEANFILES += \
        $(dbusinterface_DATA)
@@ -781,3 +794,11 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
        --with-rootdir=$$dc_install_base/$(rootdir)
+
+upload: all distcheck
+       cp -v systemd-$(VERSION).tar.bz2 /home/lennart/cvs.fedora/systemd/devel/
+       scp systemd-$(VERSION).tar.bz2 fdo:/srv/www.freedesktop.org/www/software/systemd/
+       scp man/*.html tango:public/systemd-man/
+
+git-tag:
+       git tag "v$(VERSION)" -m "systemd $(VERSION)"