X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=0b670d53404d4b422ad25bfdb81409453390f626;hp=9db127038c93256762f1f66a144af1fbd11cce73;hb=39b3b6ea8529a1302f23c24e67246b0e587ba993;hpb=d5d6a7f3040992f853eb23eb1bafac3b77891c2d diff --git a/Makefile.am b/Makefile.am index 9db127038..0b670d534 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,7 +17,13 @@ AM_CPPFLAGS = \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" +AM_CFLAGS = \ + -fvisibility=hidden \ + -ffunction-sections \ + -fdata-sections + AM_LDFLAGS = \ + -Wl,--gc-sections \ -Wl,--as-needed DISTCHECK_CONFIGURE_FLAGS = \ @@ -35,9 +41,9 @@ dist_libexec_SCRIPTS = # ------------------------------------------------------------------------------ # libudev # ------------------------------------------------------------------------------ -LIBUDEV_CURRENT=11 -LIBUDEV_REVISION=3 -LIBUDEV_AGE=11 +LIBUDEV_CURRENT=12 +LIBUDEV_REVISION=0 +LIBUDEV_AGE=12 SUBDIRS += libudev/docs @@ -55,15 +61,13 @@ libudev_libudev_la_SOURCES =\ libudev/libudev-queue.c 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 libudev_libudev_private_la_SOURCES =\ $(libudev_libudev_la_SOURCES) \ - libudev/libudev-ctrl.c \ libudev/libudev-util-private.c \ libudev/libudev-device-private.c \ libudev/libudev-queue-private.c @@ -76,7 +80,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 \ @@ -125,16 +129,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 @@ -151,7 +159,8 @@ udev_common_sources =\ udev/udev-event.c \ udev/udev-watch.c \ udev/udev-node.c \ - udev/udev-rules.c + udev/udev-rules.c \ + udev/udev-ctrl.c udev_udevd_SOURCES = \ $(udev_common_sources) \ @@ -295,6 +304,14 @@ extras_mtd_probe_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS) dist_udevrules_DATA += extras/mtd_probe/75-probe_mtd.rules libexec_PROGRAMS += extras/mtd_probe/mtd_probe +# ------------------------------------------------------------------------------ +# accelerometer - updates device orientation +# ------------------------------------------------------------------------------ +extras_accelerometer_accelerometer_SOURCES = extras/accelerometer/accelerometer.c +extras_accelerometer_accelerometer_LDADD = libudev/libudev-private.la -lm +libexec_PROGRAMS += extras/accelerometer/accelerometer +dist_udevrules_DATA += extras/accelerometer/61-accelerometer.rules + # ------------------------------------------------------------------------------ # qemu -- qemu/kvm guest tweaks # ------------------------------------------------------------------------------ @@ -404,7 +421,11 @@ extras_gudev_libgudev_1_0_la_CPPFLAGS = \ -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ -D_GUDEV_COMPILATION \ -DG_LOG_DOMAIN=\"GUdev\" -extras_gudev_libgudev_1_0_la_CFLAGS = $(GLIB_CFLAGS) + +extras_gudev_libgudev_1_0_la_CFLAGS = \ + -fvisibility=default \ + $(GLIB_CFLAGS) + extras_gudev_libgudev_1_0_la_LIBADD = libudev/libudev.la $(GLIB_LIBS) extras_gudev_libgudev_1_0_la_LDFLAGS = \ @@ -433,20 +454,21 @@ extras/gudev/gudevenumtypes.c: extras/gudev/gudevenumtypes.c.template extras/gud $(AM_V_GEN)glib-mkenums --template $^ > \ $@.tmp && mv $@.tmp $@ -extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefile.am - $(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \ - LD_LIBRARY_PATH=$(top_builddir)/extras/gudev:$$LD_LIBRARY_PATH \ - $(G_IR_SCANNER) -v \ +if ENABLE_INTROSPECTION +extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) + $(AM_V_GEN)$(G_IR_SCANNER) -v \ + --warn-all \ --namespace GUdev \ --nsversion=1.0 \ --include=GObject-2.0 \ --library=gudev-1.0 \ - --library-path=extras/gudev \ + --library-path=$(top_builddir)/libudev \ + --library-path=$(top_builddir)/extras/gudev \ --output $@ \ --pkg=glib-2.0 \ --pkg=gobject-2.0 \ - -I$(top_builddir)/extras \ -I$(top_srcdir)/extras \ + -I$(top_builddir)/extras \ -D_GUDEV_COMPILATION \ -D_GUDEV_WORK_AROUND_DEV_T_BUG \ $(top_srcdir)/extras/gudev/gudev.h \ @@ -470,6 +492,7 @@ typelibsdir = $(GIRTYPELIBDIR) typelibs_DATA = extras/gudev/GUdev-1.0.typelib CLEANFILES += $(gir_DATA) $(typelibs_DATA) +endif # ENABLE_INTROSPECTION # move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed libgudev-install-move-hook: @@ -613,34 +636,6 @@ libexec_PROGRAMS += extras/edd_id/edd_id dist_udevrules_DATA += extras/edd_id/61-persistent-storage-edd.rules endif -if ENABLE_HID2HCI -# ------------------------------------------------------------------------------ -# Bluetooth HID devices with special magic to switch the device -# ------------------------------------------------------------------------------ -extras_hid2hci_hid2hci_SOURCES = extras/hid2hci/hid2hci.c -extras_hid2hci_hid2hci_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB_CFLAGS) -extras_hid2hci_hid2hci_LDADD = libudev/libudev-private.la $(LIBUSB_LIBS) -dist_udevrules_DATA += extras/hid2hci/70-hid2hci.rules -libexec_PROGRAMS += extras/hid2hci/hid2hci -endif - -if ENABLE_ACTION_MODESWITCH -# ------------------------------------------------------------------------------ -# mobile-action-modeswitch - switch Mobile Action cables into serial mode -# ------------------------------------------------------------------------------ -extras_mobile_action_modeswitch_mobile_action_modeswitch_SOURCES =\ - extras/mobile-action-modeswitch/mobile-action-modeswitch.c \ - extras/mobile-action-modeswitch/utils.c \ - extras/mobile-action-modeswitch/utils.h \ - extras/mobile-action-modeswitch/ma8280p_us.c \ - extras/mobile-action-modeswitch/ma8280p_us.h -extras_mobile_action_modeswitch_mobile_action_modeswitch_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB_CFLAGS) -extras_mobile_action_modeswitch_mobile_action_modeswitch_LDADD = libudev/libudev-private.la $(LIBUSB_LIBS) -dist_udevrules_DATA += \ - extras/mobile-action-modeswitch/61-mobile-action.rules -libexec_PROGRAMS += extras/mobile-action-modeswitch/mobile-action-modeswitch -endif - # ------------------------------------------------------------------------------ # install, uninstall, clean hooks # ------------------------------------------------------------------------------ @@ -691,9 +686,15 @@ git-release: head -1 ChangeLog | grep -q "to v$(VERSION)" head -1 NEWS | grep -q "udev $(VERSION)" git commit -a -m "release $(VERSION)" - cat .git/refs/heads/master > .git/refs/tags/$(VERSION) - git gc - git prune + git tag $(VERSION) + git gc --prune=0 + +git-sync: + git push + git push --tags $(VERSION) + +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/