AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
+ -DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
-DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
+ -DSESSION_CONFIG_FILE=\"$(pkgsysconfdir)/session.conf\" \
-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
-DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
systemd-notify
bin_PROGRAMS = \
- systemd-install
+ systemd-install \
+ systemd-cgls
if HAVE_GTK
bin_PROGRAMS += \
pam_systemd.la
endif
+dist_pkgsysconf_DATA = \
+ src/system.conf
+
dist_dbuspolicy_DATA = \
src/org.freedesktop.systemd1.conf
dist_systemunit_DATA = \
units/emergency.service \
+ units/emergency.target \
units/basic.target \
units/getty.target \
units/halt.target \
units/rpcbind.target \
units/rtc-set.target \
units/shutdown.target \
+ units/umount.target \
units/sigpwr.target \
units/sockets.target \
units/swap.target \
+ units/dbus.target \
units/systemd-initctl.socket \
units/systemd-logger.socket \
units/dev-hugepages.automount \
units/sys-kernel-security.automount \
units/sys-kernel-security.mount \
units/var-lock.mount \
- units/var-run.mount
+ units/var-run.mount \
+ units/printer.target \
+ units/bluetooth.target
nodist_systemunit_DATA = \
units/sysinit.target \
units/fedora/prefdm.service \
units/fedora/rc-local.service \
units/fedora/reboot.service \
- units/fedora/sysinit.service
+ units/fedora/sysinit.service \
+ units/fedora/single.service
endif
if TARGET_SUSE
libsystemd-basic.la \
libsystemd-core.la
-# This is needed because automake is buggy in how it generates the
-# rules for C programs, but not Vala programs. We therefore can't
-# list the .h files as dependencies if we want make dist to work.
-
libsystemd_basic_la_SOURCES = \
src/util.c \
src/hashmap.c \
src/hostname-setup.c \
src/loopback-setup.c \
src/kmod-setup.c \
+ src/modprobe-setup.c \
src/utmp-wtmp.c \
src/specifier.c \
src/unit-name.c \
libsystemd_core_la_CFLAGS = \
$(AM_CFLAGS) \
$(DBUS_CFLAGS) \
- $(UDEV_CFLAGS) \
- $(CGROUP_CFLAGS)
+ $(UDEV_CFLAGS)
libsystemd_core_la_LIBADD = \
libsystemd-basic.la \
$(DBUS_LIBS) \
$(UDEV_LIBS) \
- $(CGROUP_LIBS) \
$(LIBWRAP_LIBS) \
$(PAM_LIBS)
+# This is needed because automake is buggy in how it generates the
+# rules for C programs, but not Vala programs. We therefore can't
+# 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/linux/auto_dev-ioctl.h \
src/initreq.h \
src/sd-daemon.h \
- src/special.h
-
+ src/special.h \
+ src/dbus-common.h \
+ src/bus-errors.h \
+ src/cgroup-show.h
MANPAGES = \
man/systemd.1 \
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 \
man/systemd.target.5 \
man/systemd.device.5 \
man/systemd.snapshot.5 \
+ man/systemd.exec.5 \
man/daemon.7 \
man/sd-daemon.7 \
man/runlevel.8 \
man/telinit.8 \
man/halt.8 \
man/shutdown.8 \
- man/pam_systemd.8
+ man/pam_systemd.8 \
+ man/systemd.conf.5
MANPAGES_ALIAS = \
man/reboot.8 \
systemd_CFLAGS = \
$(AM_CFLAGS) \
$(DBUS_CFLAGS) \
- $(UDEV_CFLAGS) \
- $(CGROUP_CFLAGS)
+ $(UDEV_CFLAGS)
systemd_LDADD = \
libsystemd-core.la
src/cgroup-util.c
test_cgroup_CFLAGS = \
- $(AM_CFLAGS) \
- $(CGROUP_CFLAGS)
+ $(AM_CFLAGS)
test_cgroup_LDADD = \
- libsystemd-basic.la \
- $(CGROUP_LIBS)
+ libsystemd-basic.la
systemd_logger_SOURCES = \
src/logger.c \
systemd_initctl_SOURCES = \
src/initctl.c \
- src/sd-daemon.c
+ src/sd-daemon.c \
+ src/dbus-common.c
systemd_initctl_CFLAGS = \
$(AM_CFLAGS) \
systemctl_SOURCES = \
src/systemctl.c \
- src/utmp-wtmp.c
+ src/utmp-wtmp.c \
+ src/dbus-common.c \
+ src/cgroup-show.c \
+ src/cgroup-util.c
systemctl_CFLAGS = \
$(AM_CFLAGS) \
systemd_install_SOURCES = \
src/install.c \
- src/path-lookup.c
+ src/path-lookup.c \
+ src/dbus-common.c \
+ src/sd-daemon.c
systemd_install_LDADD = \
- libsystemd-basic.la
+ libsystemd-basic.la \
+ $(DBUS_LIBS)
-# We don't really link here against D-Bus, however we indirectly include D-Bus header files
systemd_install_CFLAGS = \
$(AM_CFLAGS) \
$(DBUS_CFLAGS)
+systemd_cgls_SOURCES = \
+ src/systemd-cgls.c \
+ src/cgroup-show.c \
+ src/cgroup-util.c
+
+systemd_cgls_CFLAGS = \
+ $(AM_CFLAGS)
+
+systemd_cgls_LDADD = \
+ libsystemd-basic.la
+
systemadm_SOURCES = \
src/systemadm.vala \
src/systemd-interfaces.vala
src/sd-daemon.c
pam_systemd_la_CFLAGS = \
- $(AM_CFLAGS) \
- $(CGROUP_CFLAGS) \
+ $(AM_CFLAGS)
-fvisibility=hidden
pam_systemd_la_LDFLAGS = \
pam_systemd_la_LIBADD = \
libsystemd-basic.la \
- $(PAM_LIBS) \
- $(CGROUP_LIBS)
+ $(PAM_LIBS)
SED_PROCESS = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
$(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
-e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
- -e 's,@SPECIAL_DBUS_SERVICE\@,$(SPECIAL_DBUS_SERVICE),g' \
-e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
-e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
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)
$(LN_S) ../systemd-logger.socket systemd-logger.socket && \
$(LN_S) ../systemd-initctl.socket systemd-initctl.socket )
( cd $(DESTDIR)$(sessionunitdir) && \
- rm -f shutdown.target sockets.target local-fs.target swap.target && \
+ rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
$(LN_S) $(systemunitdir)/sockets.target sockets.target && \
$(LN_S) $(systemunitdir)/local-fs.target local-fs.target && \
- $(LN_S) $(systemunitdir)/swap.target swap.target )
+ $(LN_S) $(systemunitdir)/swap.target swap.target && \
+ $(LN_S) $(systemunitdir)/bluetooth.target bluetooth.target && \
+ $(LN_S) $(systemunitdir)/printer.target printer.target)
( cd $(DESTDIR)$(systemunitdir) && \
rm -f runlevel0.target runlevel1.target runlevel6.target && \
$(LN_S) poweroff.target runlevel0.target && \
$(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
if TARGET_FEDORA
$(MKDIR_P) -m 0755 \
- $(DESTDIR)$(SYSTEM_SYSVINIT_PATH)
+ $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
+ $(DESTDIR)$(systemunitdir)/rescue.target.wants
( cd $(DESTDIR)$(pkgsysconfdir)/system && \
rm -f display-manager.service && \
$(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
- rm -f display-manager.service && \
- $(LN_S) ../display-manager.service display-manager.service )
+ rm -f prefdm.service && \
+ $(LN_S) $(systemunitdir)/prefdm.service prefdm.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
rm -f rc-local.service && \
$(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
+ ( cd $(DESTDIR)$(systemunitdir)/rescue.target.wants && \
+ rm -f single.service && \
+ $(LN_S) $(systemunitdir)/single.service single.service )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f local.service && \
$(LN_S) rc-local.service local.service )
rm -f display-manager.service && \
$(LN_S) $(systemunitdir)/xdm.service display-manager.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
- rm -f display-manager.service && \
- $(LN_S) ../display-manager.service display-manager.service )
+ rm -f xdm.service && \
+ $(LN_S) $(systemunitdir)/xdm.service xdm.service )
endif
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)"
~ianmdlvl / elogind.git / blobdiff