X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=ab7fca677a5165f0d91f257d7858be9e2b55a7a5;hb=8d8e945624a0080073d94941f3032b8fa3b3aa15;hp=1371a7753687597a18f8ed0d710c9c2f88d97cf1;hpb=9e13dbae509605dba1bde7e7385086b59acb428e;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 1371a7753..ab7fca677 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -304,6 +304,7 @@ 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 \
@@ -339,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 \
@@ -600,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) \
@@ -679,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 \
@@ -1276,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
@@ -1340,19 +1348,12 @@ libudev_private_la_SOURCES =\
 	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 = \
-	libsystemd-shared.la \
-	$(SELINUX_LIBS)
+	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 MANPAGES += \
@@ -1632,8 +1633,10 @@ dist_udevrules_DATA += \
 
 # ------------------------------------------------------------------------------
 if ENABLE_GUDEV
+if ENABLE_GTK_DOC
 SUBDIRS += \
 	docs/gudev
+endif
 
 libgudev_includedir = \
 	$(includedir)/gudev-1.0/gudev
@@ -3122,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 \
@@ -3240,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/
@@ -3249,9 +3255,11 @@ 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 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)"