chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
util: unify getenv() logic for other PID
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 7df3915b753c616e1fc2cd41afe1d0d782c30864..ab7fca677a5165f0d91f257d7858be9e2b55a7a5 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 \
@@ -296,13 +297,14 @@ 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 \
        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 \
@@ -323,9 +325,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 \
@@ -338,6 +340,7 @@ EXTRA_DIST += \
        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 \
@@ -359,9 +362,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
 
@@ -599,7 +602,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) \
@@ -678,6 +683,8 @@ libsystemd_core_la_SOURCES = \
        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 \
@@ -1275,8 +1282,10 @@ EXTRA_DIST += \
        src/libsystemd-daemon/libsystemd-daemon.sym
 
 # ------------------------------------------------------------------------------
+if ENABLE_GTK_DOC
 SUBDIRS += \
        docs/libudev
+endif
 
 include_HEADERS += \
        src/libudev/libudev.h
@@ -1302,6 +1311,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
 
@@ -1333,28 +1345,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
@@ -1394,30 +1399,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
@@ -1446,6 +1451,7 @@ libudev_core_la_CFLAGS = \
 
 libudev_core_la_LIBADD = \
        libudev-private.la \
+       libsystemd-label.la \
        libsystemd-shared.la \
        $(BLKID_LIBS) \
        $(KMOD_LIBS)
@@ -1465,10 +1471,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 = \
@@ -1498,6 +1504,8 @@ test_libudev_SOURCES = \
        src/test/test-libudev.c
 
 test_libudev_LDADD = \
+       libsystemd-label.la \
+       libsystemd-shared.la \
        libudev.la
 
 test_udev_SOURCES = \
@@ -1516,6 +1524,7 @@ test_udev_CPPFLAGS =\
        $(libudev_core_la_CPPFLAGS)
 
 test_udev_LDADD = \
+       libsystemd-label.la \
        libsystemd-shared.la \
        $(BLKID_LIBS) \
        $(KMOD_LIBS) \
@@ -1624,8 +1633,10 @@ dist_udevrules_DATA += \
 
 # ------------------------------------------------------------------------------
 if ENABLE_GUDEV
+if ENABLE_GTK_DOC
 SUBDIRS += \
        docs/gudev
+endif
 
 libgudev_includedir = \
        $(includedir)/gudev-1.0/gudev
@@ -1796,6 +1807,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
@@ -3111,7 +3125,6 @@ systemd-install-data-hook:
                $(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 \
@@ -3219,6 +3232,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) \
@@ -3226,8 +3242,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/
@@ -3235,9 +3255,16 @@ upload: all distcheck
        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
Unnamed repository; edit this file 'description' to name the repository.