X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=7e6f52074a56ed3252e76a4d198d6552ce469a26;hp=90c225ec01ddd90bed03dfd792b86ddf7c59994f;hb=80a5cbace45a6adbf2f9119edc5a4b10db493064;hpb=f13b388f97bc3ba8db844bd3413d510e2466a0b6

diff --git a/Makefile.am b/Makefile.am
index 90c225ec0..7e6f52074 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1276,8 +1276,10 @@ EXTRA_DIST += \
 	src/libsystemd-daemon/libsystemd-daemon.sym
 
 # ------------------------------------------------------------------------------
+if ENABLE_GTK_DOC
 SUBDIRS += \
 	docs/libudev
+endif
 
 include_HEADERS += \
 	src/libudev/libudev.h
@@ -1337,23 +1339,15 @@ 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 = \
-	libsystemd-shared.la \
-	$(SELINUX_LIBS)
+	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 MANPAGES += \
@@ -1451,6 +1445,7 @@ libudev_core_la_CFLAGS = \
 
 libudev_core_la_LIBADD = \
 	libudev-private.la \
+	libsystemd-label.la \
 	libsystemd-shared.la \
 	$(BLKID_LIBS) \
 	$(KMOD_LIBS)
@@ -1503,6 +1498,7 @@ test_libudev_SOURCES = \
 	src/test/test-libudev.c
 
 test_libudev_LDADD = \
+	libsystemd-label.la \
 	libsystemd-shared.la \
 	libudev.la
 
@@ -1522,6 +1518,7 @@ test_udev_CPPFLAGS =\
 	$(libudev_core_la_CPPFLAGS)
 
 test_udev_LDADD = \
+	libsystemd-label.la \
 	libsystemd-shared.la \
 	$(BLKID_LIBS) \
 	$(KMOD_LIBS) \
@@ -1630,8 +1627,10 @@ dist_udevrules_DATA += \
 
 # ------------------------------------------------------------------------------
 if ENABLE_GUDEV
+if ENABLE_GTK_DOC
 SUBDIRS += \
 	docs/gudev
+endif
 
 libgudev_includedir = \
 	$(includedir)/gudev-1.0/gudev
@@ -3238,8 +3237,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 +3252,7 @@ upload: all distcheck
 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/
+	rsync -av man/*.html www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/man/
 
 git-tag:
 	git tag "v$(VERSION)" -m "systemd $(VERSION)"