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

diff --git a/Makefile.am b/Makefile.am
index 1371a7753..cc284a709 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -600,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) \
@@ -679,6 +681,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 +1280,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 +1346,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 +1631,10 @@ dist_udevrules_DATA += \
 
 # ------------------------------------------------------------------------------
 if ENABLE_GUDEV
+if ENABLE_GTK_DOC
 SUBDIRS += \
 	docs/gudev
+endif
 
 libgudev_includedir = \
 	$(includedir)/gudev-1.0/gudev
@@ -3240,8 +3241,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,7 +3254,9 @@ 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 man/*.html www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/man/