chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
docs: rebase html documentation for online and local use
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 33b51d8e30d3c2c38403f4fbdb1a5cb42688e1f5..4d13eea841aec09cc12dc801f43a015ef895c3cd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -101,6 +101,7 @@ check_PROGRAMS =
 check_DATA =
 noinst_PROGRAMS =
 TESTS =
+udevlibexec_PROGRAMS =
 
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
@@ -136,7 +137,8 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/journal \
        -I $(top_srcdir)/src/systemd \
        -I $(top_srcdir)/src/core \
-       -I $(top_srcdir)/src/libudev
+       -I $(top_srcdir)/src/libudev \
+       -I $(top_srcdir)/src/udev
 
 AM_CFLAGS = $(WARNINGFLAGS)
 AM_LDFLAGS = $(GCLDFLAGS)
@@ -295,8 +297,8 @@ dist_systemunit_DATA = \
        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
 
 nodist_systemunit_DATA = \
        units/getty@.service \
@@ -322,9 +324,9 @@ nodist_systemunit_DATA = \
        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 \
@@ -358,9 +360,9 @@ EXTRA_DIST += \
        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
 
@@ -598,7 +600,9 @@ libsystemd_label_la_SOURCES = \
        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) \
@@ -1274,8 +1278,10 @@ EXTRA_DIST += \
        src/libsystemd-daemon/libsystemd-daemon.sym
 
 # ------------------------------------------------------------------------------
+if ENABLE_GTK_DOC
 SUBDIRS += \
        docs/libudev
+endif
 
 include_HEADERS += \
        src/libudev/libudev.h
@@ -1301,6 +1307,9 @@ libudev_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
 
+libudev_la_LIBADD = \
+       libsystemd-shared.la
+
 pkgconfiglib_DATA += \
        src/libudev/libudev.pc
 
@@ -1332,28 +1341,21 @@ noinst_LTLIBRARIES += \
 
 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
@@ -1393,30 +1395,30 @@ CLEANFILES += \
        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
@@ -1445,6 +1447,7 @@ libudev_core_la_CFLAGS = \
 
 libudev_core_la_LIBADD = \
        libudev-private.la \
+       libsystemd-label.la \
        libsystemd-shared.la \
        $(BLKID_LIBS) \
        $(KMOD_LIBS)
@@ -1464,10 +1467,10 @@ libudev_core_la_LIBADD += \
        libsystemd-acl.la
 endif
 
-udevd_SOURCES = \
+systemd_udevd_SOURCES = \
        src/udev/udevd.c
 
-udevd_LDADD = \
+systemd_udevd_LDADD = \
        libudev-core.la
 
 udevadm_SOURCES = \
@@ -1486,43 +1489,64 @@ udevadm_LDADD = \
 
 # ------------------------------------------------------------------------------
 TESTS += \
-       src/udev/test/udev-test.pl \
-       src/udev/test/rules-test.sh
+       test/udev-test.pl \
+       test/rules-test.sh
 
 noinst_PROGRAMS += \
        test-libudev \
        test-udev
 
 test_libudev_SOURCES = \
-       src/udev/test-libudev.c
+       src/test/test-libudev.c
 
 test_libudev_LDADD = \
+       libsystemd-label.la \
+       libsystemd-shared.la \
        libudev.la
 
 test_udev_SOURCES = \
-       src/udev/test-udev.c
+       src/test/test-udev.c \
+       $(libudev_core_la_SOURCES) \
+       $(libudev_private_la_SOURCES)
+
+# The test-udev program needs everything compiled with relative path
+# names for /sys, /dev, /run prefixed, pointing to our test/ directory.
+test_udev_CFLAGS = \
+       -DTEST_PREFIX=\"test\" \
+       $(libudev_core_la_CFLAGS) \
+       $(libudev_private_la_CFLAGS)
+
+test_udev_CPPFLAGS =\
+       $(libudev_core_la_CPPFLAGS)
 
 test_udev_LDADD = \
-       libudev-core.la \
-       libudev-private.la \
-       libsystemd-shared.la
+       libsystemd-label.la \
+       libsystemd-shared.la \
+       $(BLKID_LIBS) \
+       $(KMOD_LIBS) \
+       $(SELINUX_LIBS)
+
+if HAVE_ACL
+test_udev_LDADD += \
+       libsystemd-acl.la
+endif
 
 check_DATA += \
-       src/udev/test/sys
+       test/sys
 
 # packed sysfs test tree
-src/udev/test/sys:
-       $(AM_V_GEN)mkdir -p src/udev/test && tar -C src/udev/test/ -xJf $(top_srcdir)/src/udev/test/sys.tar.xz
+test/sys:
+       $(AM_V_GEN)mkdir -p test && tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz
 
 test-sys-distclean:
-       -rm -rf src/udev/test/sys
+       -rm -rf test/sys
 DISTCLEAN_LOCAL_HOOKS += test-sys-distclean
 
 EXTRA_DIST += \
-       src/udev/test/sys.tar.xz \
-       src/udev/test/udev-test.pl \
-       src/udev/test/rules-test.sh \
-       src/udev/test/rule-syntax-check.py
+       test/sys.tar.xz \
+       test/udev-test.pl \
+       test/rules-test.sh \
+       test/rule-syntax-check.py
 
 # ------------------------------------------------------------------------------
 ata_id_SOURCES = \
@@ -1547,7 +1571,7 @@ udevlibexec_PROGRAMS += \
        cdrom_id
 
 dist_udevrules_DATA += \
-       src/udev/cdrom_id/60-cdrom_id.rules
+       rules/60-cdrom_id.rules
 
 # ------------------------------------------------------------------------------
 collect_SOURCES = \
@@ -1587,7 +1611,7 @@ udevlibexec_PROGRAMS += \
        v4l_id
 
 dist_udevrules_DATA += \
-       src/udev/v4l_id/60-persistent-v4l.rules
+       rules/60-persistent-v4l.rules
 
 # ------------------------------------------------------------------------------
 accelerometer_SOURCES = \
@@ -1601,12 +1625,14 @@ udevlibexec_PROGRAMS += \
        accelerometer
 
 dist_udevrules_DATA += \
-       src/udev/accelerometer/61-accelerometer.rules
+       rules/61-accelerometer.rules
 
 # ------------------------------------------------------------------------------
 if ENABLE_GUDEV
+if ENABLE_GTK_DOC
 SUBDIRS += \
        docs/gudev
+endif
 
 libgudev_includedir = \
        $(includedir)/gudev-1.0/gudev
@@ -1777,6 +1803,9 @@ keymap_SOURCES = \
 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
@@ -1872,12 +1901,12 @@ dist_udevkeymap_DATA = \
 
 udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release
 dist_udevkeymapforcerel_DATA = \
-       src/udev/keymap/force-release-maps/dell-touchpad \
-       src/udev/keymap/force-release-maps/dell-xps \
-       src/udev/keymap/force-release-maps/hp-other \
-       src/udev/keymap/force-release-maps/samsung-other \
-       src/udev/keymap/force-release-maps/samsung-90x3a \
-       src/udev/keymap/force-release-maps/common-volume-keys
+       keymaps-force-release/dell-touchpad \
+       keymaps-force-release/dell-xps \
+       keymaps-force-release/hp-other \
+       keymaps-force-release/samsung-other \
+       keymaps-force-release/samsung-90x3a \
+       keymaps-force-release/common-volume-keys
 
 src/udev/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
        $(AM_V_at)mkdir -p src/udev/keymap
@@ -1903,7 +1932,7 @@ mtd_probe_CPPFLAGS = \
        $(AM_CPPFLAGS)
 
 dist_udevrules_DATA += \
-       src/udev/mtd_probe/75-probe_mtd.rules
+       rules/75-probe_mtd.rules
 
 udevlibexec_PROGRAMS += \
        mtd_probe
@@ -2576,6 +2605,8 @@ systemd_logind_SOURCES = \
        src/login/logind-session.h \
        src/login/logind-user.c \
        src/login/logind-user.h \
+       src/login/logind-inhibit.c \
+       src/login/logind-inhibit.h \
        src/login/logind-session-dbus.c \
        src/login/logind-seat-dbus.c \
        src/login/logind-user-dbus.c \
@@ -2637,8 +2668,20 @@ test_login_LDADD = \
        libsystemd-login.la \
        libsystemd-shared.la
 
+test_inhibit_SOURCES = \
+       src/login/test-inhibit.c
+
+test_inhibit_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-dbus.la
+
+test_inhibit_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
 noinst_PROGRAMS += \
-       test-login
+       test-login \
+       test-inhibit
 
 libsystemd_login_la_SOURCES = \
        src/login/sd-login.c
@@ -3186,6 +3229,9 @@ install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS)
 
 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) \
@@ -3193,8 +3239,12 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --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/
@@ -3202,9 +3252,16 @@ upload: all distcheck
        scp man/*.html tango:public/systemd-man/
 
 doc-sync: all
+       gtkdoc-rebase --html-dir=docs/libudev/html --online
        rsync -av --delete docs/libudev/html/ 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/ 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/
+       rsync -av man/*.html 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
Unnamed repository; edit this file 'description' to name the repository.