check_DATA =
noinst_PROGRAMS =
TESTS =
+udevlibexec_PROGRAMS =
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
systemd-shutdownd \
systemd-shutdown \
systemd-modules-load \
- systemd-remount-api-vfs \
+ systemd-remount-fs \
systemd-reply-password \
systemd-fsck \
systemd-timestamp \
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 \
units/systemd-ask-password-wall.path \
units/systemd-ask-password-console.path \
units/syslog.target \
- units/udev-control.socket \
- units/udev-kernel.socket
+ units/systemd-udev-control.socket \
+ units/systemd-udev-kernel.socket \
+ units/systemd-timedated-ntp.target
nodist_systemunit_DATA = \
units/getty@.service \
units/serial-getty@.service \
units/console-shell.service \
+ units/console-getty.service \
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 \
units/fsck-root.service \
units/rescue.service \
units/user@.service \
- units/udev.service \
- units/udev-trigger.service \
- units/udev-settle.service
+ units/systemd-udev.service \
+ units/systemd-udev-trigger.service \
+ units/systemd-udev-settle.service
dist_userunit_DATA = \
units/user/default.target \
units/getty@.service.m4 \
units/serial-getty@.service.m4 \
units/console-shell.service.m4.in \
+ units/console-getty.service.m4.in \
units/rescue.service.m4.in \
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 \
units/fsck@.service.in \
units/fsck-root.service.in \
units/user@.service.in \
- units/udev.service \
- units/udev-trigger.service \
- units/udev-settle.service \
+ units/systemd-udev.service \
+ units/systemd-udev-trigger.service \
+ units/systemd-udev-settle.service \
introspect.awk \
man/custom-html.xsl
src/shared/mkdir.c \
src/shared/mkdir.h \
src/shared/ask-password-api.c \
- src/shared/ask-password-api.h
+ src/shared/ask-password-api.h \
+ src/shared/dev-setup.c \
+ src/shared/dev-setup.h
libsystemd_label_la_CFLAGS = \
$(AM_CFLAGS) \
src/core/job.h \
src/core/manager.c \
src/core/manager.h \
+ src/core/transaction.c \
+ src/core/transaction.h \
src/core/load-fragment.c \
src/core/load-fragment.h \
src/core/service.c \
$(DBUS_CFLAGS)
test_job_type_LDADD = \
- libsystemd-core.la
+ libsystemd-core.la \
+ libsystemd-daemon.la
test_ns_SOURCES = \
src/test/test-ns.c
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
# ------------------------------------------------------------------------------
src/libsystemd-daemon/libsystemd-daemon.sym
# ------------------------------------------------------------------------------
+if ENABLE_GTK_DOC
SUBDIRS += \
docs/libudev
+endif
include_HEADERS += \
src/libudev/libudev.h
$(AM_LDFLAGS) \
-version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
+libudev_la_LIBADD = \
+ libsystemd-shared.la
+
pkgconfiglib_DATA += \
src/libudev/libudev.pc
libudev_private_la_SOURCES =\
$(libudev_la_SOURCES) \
- src/libudev/libudev-util-private.c \
src/libudev/libudev-device-private.c \
src/libudev/libudev-queue-private.c
-if HAVE_SELINUX
-libudev_private_la_SOURCES +=\
- src/libudev/libudev-selinux-private.c
-endif
-
libudev_private_la_CFLAGS = \
$(AM_CFLAGS) \
- $(SELINUX_CFLAGS)
-fvisibility=default
libudev_private_la_LIBADD = \
- $(SELINUX_LIBS)
+ libsystemd-shared.la
# ------------------------------------------------------------------------------
MANPAGES += \
man/udev.7 \
man/udevadm.8 \
- man/udevd.8
+ man/systemd-udevd.8
udev-confdirs:
-mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
src/udev/udev.pc
EXTRA_DIST += \
- units/udev.service.in \
- units/udev-trigger.service.in \
- units/udev-settle.service.in
+ units/systemd-udev.service.in \
+ units/systemd-udev-trigger.service.in \
+ units/systemd-udev-settle.service.in
CLEANFILES += \
- units/udev.service \
- units/udev-trigger.service \
- units/udev-settle.service
+ units/systemd-udev.service \
+ units/systemd-udev-trigger.service \
+ units/systemd-udev-settle.service
systemd-install-hook:
mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants
- ln -sf ../udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/udev-control.socket
- ln -sf ../udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/udev-kernel.socket
+ ln -sf ../systemd-udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-control.socket
+ ln -sf ../systemd-udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-kernel.socket
mkdir -p $(DESTDIR)$(systemunitdir)/basic.target.wants
- ln -sf ../udev.service $(DESTDIR)$(systemunitdir)/basic.target.wants/udev.service
- ln -sf ../udev-trigger.service $(DESTDIR)$(systemunitdir)/basic.target.wants/udev-trigger.service
+ ln -sf ../systemd-udev.service $(DESTDIR)$(systemunitdir)/basic.target.wants/systemd-udev.service
+ ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/basic.target.wants/systemd-udev-trigger.service
INSTALL_DATA_HOOKS += systemd-install-hook
bin_PROGRAMS += \
udevadm
-udevlibexec_PROGRAMS = \
- udevd
+rootlibexec_PROGRAMS += \
+ systemd-udevd
noinst_LTLIBRARIES += \
libudev-core.la
libudev_core_la_LIBADD = \
libudev-private.la \
+ libsystemd-label.la \
libsystemd-shared.la \
$(BLKID_LIBS) \
$(KMOD_LIBS)
libsystemd-acl.la
endif
-udevd_SOURCES = \
+systemd_udevd_SOURCES = \
src/udev/udevd.c
-udevd_LDADD = \
+systemd_udevd_LDADD = \
libudev-core.la
udevadm_SOURCES = \
src/test/test-libudev.c
test_libudev_LDADD = \
+ libsystemd-label.la \
+ libsystemd-shared.la \
libudev.la
test_udev_SOURCES = \
$(libudev_core_la_CPPFLAGS)
test_udev_LDADD = \
+ libsystemd-label.la \
libsystemd-shared.la \
$(BLKID_LIBS) \
$(KMOD_LIBS) \
# ------------------------------------------------------------------------------
if ENABLE_GUDEV
+if ENABLE_GTK_DOC
SUBDIRS += \
docs/gudev
+endif
libgudev_includedir = \
$(includedir)/gudev-1.0/gudev
keymap_CPPFLAGS = \
$(AM_CPPFLAGS) -I src/udev/keymap
+keymap_LDADD = \
+ libsystemd-shared.la
+
nodist_keymap_SOURCES = \
src/udev/keymap/keys-from-name.h \
src/udev/keymap/keys-to-name.h
-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' \
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 && \
$(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
if HAVE_PLYMOUTH
$(MKDIR_P) -m 0755 \
- $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
$(DESTDIR)$(systemunitdir)/reboot.target.wants \
$(DESTDIR)$(systemunitdir)/kexec.target.wants \
$(DESTDIR)$(systemunitdir)/poweroff.target.wants \
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 && \
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 && \
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 && \
distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
+clean-local:
+ rm -rf $(abs_srcdir)/install-tree
+
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
--with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
--with-rootprefix=$$dc_install_base \
- --disable-split-usr \
+ --disable-split-usr
+
+if ENABLE_GTK_DOC
+DISTCHECK_CONFIGURE_FLAGS += \
--enable-gtk-doc
+endif
upload: all distcheck
cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
scp man/*.html tango:public/systemd-man/
doc-sync: all
- rsync -av --delete docs/libudev/html/ www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/libudev/
- rsync -av --delete docs/gudev/html/ www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/gudev/
- rsync -av --delete man/*.html www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/man/
+ gtkdoc-rebase --html-dir=docs/libudev/html --online
+ rsync -av --delete docs/libudev/html/ --omit-dir-times www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/libudev/
+ gtkdoc-rebase --html-dir=docs/gudev/html --online
+ rsync -av --delete docs/gudev/html/ --omit-dir-times www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/gudev/
+ rsync -av --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/man/
git-tag:
git tag "v$(VERSION)" -m "systemd $(VERSION)"
+
+install-tree: all
+ rm -rf $(abs_srcdir)/install-tree
+ make install DESTDIR=$(abs_srcdir)/install-tree
+ tree $(abs_srcdir)/install-tree