X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=998a385944f7ce33e17307b1d00d7bbbbd53d7e7;hp=1b0d6a3797b4efcbe32a1ab98ee0db3277b9461c;hb=ea69e8217b4ddb9b054b2d3bf18260e71102646f;hpb=f0ed90b7678045759ffa2a44d2b4cac96968b077

diff --git a/Makefile.am b/Makefile.am
index 1b0d6a379..998a38594 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,7 @@ dist_libexec_SCRIPTS =
 # libudev
 # ------------------------------------------------------------------------------
 LIBUDEV_CURRENT=11
-LIBUDEV_REVISION=4
+LIBUDEV_REVISION=5
 LIBUDEV_AGE=11
 
 SUBDIRS += libudev/docs
@@ -60,12 +60,8 @@ libudev_libudev_la_SOURCES =\
 	libudev/libudev-monitor.c \
 	libudev/libudev-queue.c
 
-libudev_libudev_la_CFLAGS = \
-	-fvisibility=default
-
 libudev_libudev_la_LDFLAGS = \
-	-version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \
-	-export-symbols $(top_srcdir)/libudev/exported_symbols
+	-version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
 
 noinst_LTLIBRARIES = \
 	libudev/libudev-private.la
@@ -85,7 +81,7 @@ endif
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libudev/libudev.pc
 
-EXTRA_DIST += libudev/exported_symbols libudev/COPYING
+EXTRA_DIST += libudev/COPYING
 # move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed
 libudev-install-move-hook:
 	if test "$(libdir)" != "$(rootlib_execdir)"; then \
@@ -134,16 +130,20 @@ sharepkgconfig_DATA = udev/udev.pc
 
 if WITH_SYSTEMD
 systemdsystemunit_DATA = \
-	init/udev.socket \
+	init/udev-control.socket \
+	init/udev-kernel.socket \
 	init/udev.service \
 	init/udev-trigger.service \
 	init/udev-settle.service
 
-EXTRA_DIST += init/udev.socket
+EXTRA_DIST += \
+	init/udev-control.socket \
+	init/udev-kernel.socket
 
 systemd-install-hook:
 	mkdir -p $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants
-	ln -sf ../udev.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/udev.socket
+	ln -sf ../udev-control.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/udev-control.socket
+	ln -sf ../udev-kernel.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/udev-kernel.socket
 	mkdir -p $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants
 	ln -sf ../udev.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev.service
 	ln -sf ../udev-trigger.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev-trigger.service
@@ -699,6 +699,9 @@ git-release:
 	git gc
 	git prune
 
+tar-sync:
+	scp udev-$(VERSION).gz master.kernel.org:/pub/linux/utils/kernel/hotplug/
+
 doc-sync:
 	rsync -av udev/*.html master.kernel.org:/pub/linux/utils/kernel/hotplug/udev/
 	rsync -av --delete libudev/docs/html/ master.kernel.org:/pub/linux/utils/kernel/hotplug/libudev/