X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=47ed3ccc48c99b2bdee5da4e2b7b21eb6f7fbcd8;hp=6a900b0a2b056a6081e759be0659b269901cd5cc;hb=f71a55810f09fc010b44689aa00823a745ff83c6;hpb=48b14aa053b5a7c76a47ff560a4115ad41666290 diff --git a/Makefile.am b/Makefile.am index 6a900b0a2..47ed3ccc4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,8 +5,6 @@ SUBDIRS = . -EXTRA_DIST = - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} AM_MAKEFLAGS = --no-print-directory @@ -18,6 +16,7 @@ AM_CPPFLAGS = \ -DLIBEXECDIR=\""$(libexecdir)"\" AM_CFLAGS = \ + ${my_CFLAGS} \ -fvisibility=hidden \ -ffunction-sections \ -fdata-sections @@ -30,14 +29,39 @@ DISTCHECK_CONFIGURE_FLAGS = \ --enable-gtk-doc \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) -CLEANFILES = BUILT_SOURCES = +EXTRA_DIST = +CLEANFILES = INSTALL_EXEC_HOOKS = INSTALL_DATA_HOOKS = UNINSTALL_EXEC_HOOKS = DISTCHECK_HOOKS = +libexec_SCRIPTS = dist_libexec_SCRIPTS = +SED_PROCESS = \ +$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \ + -e 's,@VERSION\@,$(VERSION),g' \ + -e 's,@prefix\@,$(prefix),g' \ + -e 's,@exec_prefix\@,$(exec_prefix),g' \ + -e 's,@libdir\@,$(libdir),g' \ + -e 's,@includedir\@,$(includedir),g' \ + -e 's,@bindir\@,$(bindir),g' \ + -e 's,@libexecdir\@,$(libexecdir),g' \ + < $< > $@ || rm $@ + +%.pc: %.pc.in Makefile + $(SED_PROCESS) + +%.rules: %.rules.in Makefile + $(SED_PROCESS) + +%.service: %.service.in + $(SED_PROCESS) + +%.sh: %.sh.in + $(SED_PROCESS) + # ------------------------------------------------------------------------------ # libudev # ------------------------------------------------------------------------------ @@ -80,6 +104,8 @@ endif pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libudev/libudev.pc +EXTRA_DIST += libudev/libudev.pc.in +CLEANFILES += libudev/libudev.pc EXTRA_DIST += libudev/COPYING # move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed @@ -114,11 +140,11 @@ EXTRA_DIST += \ udevrulesdir = $(libexecdir)/rules.d dist_udevrules_DATA = \ rules/rules.d/50-udev-default.rules \ - rules/rules.d/60-persistent-storage.rules \ rules/rules.d/60-persistent-storage-tape.rules \ rules/rules.d/60-persistent-serial.rules \ rules/rules.d/60-persistent-input.rules \ rules/rules.d/60-persistent-alsa.rules \ + rules/rules.d/60-persistent-storage.rules \ rules/rules.d/80-drivers.rules \ rules/rules.d/95-udev-late.rules @@ -127,18 +153,28 @@ dist_udevconf_DATA = udev.conf sharepkgconfigdir = $(datadir)/pkgconfig sharepkgconfig_DATA = udev/udev.pc +EXTRA_DIST += udev/udev.pc.in +CLEANFILES += udev/udev.pc if WITH_SYSTEMD -systemdsystemunit_DATA = \ +dist_systemdsystemunit_DATA = \ systemd/udev-control.socket \ - systemd/udev-kernel.socket \ + systemd/udev-kernel.socket + +systemdsystemunit_DATA = \ systemd/udev.service \ systemd/udev-trigger.service \ systemd/udev-settle.service EXTRA_DIST += \ - systemd/udev-control.socket \ - systemd/udev-kernel.socket + systemd/udev.service.in \ + systemd/udev-trigger.service.in \ + systemd/udev-settle.service.in + +CLEANFILES += \ + systemd/udev.service \ + systemd/udev-trigger.service \ + systemd/udev-settle.service systemd-install-hook: mkdir -p $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants @@ -151,13 +187,13 @@ systemd-install-hook: INSTALL_DATA_HOOKS += systemd-install-hook endif -sbin_PROGRAMS = \ +bin_PROGRAMS = \ udev/udevadm libexec_PROGRAMS = \ udev/udevd -udev_common_sources =\ +udev_common_sources = \ udev/udev.h \ udev/udev-event.c \ udev/udev-watch.c \ @@ -167,14 +203,26 @@ udev_common_sources =\ udev/udev-builtin.c \ udev/udev-builtin-path_id.c \ udev/udev-builtin-usb_id.c \ - udev/udev-builtin-input_id.c + udev/udev-builtin-input_id.c \ + udev/udev-builtin-blkid.c \ + udev/udev-builtin-kmod.c + +udev_common_CFLAGS = \ + $(BLKID_CFLAGS) \ + $(KMOD_CFLAGS) + +udev_common_LDADD = \ + libudev/libudev-private.la \ + $(BLKID_LIBS) \ + $(BLKID_KMOD) udev_udevd_SOURCES = \ $(udev_common_sources) \ udev/udevd.c \ udev/sd-daemon.h \ udev/sd-daemon.c -udev_udevd_LDADD = libudev/libudev-private.la +udev_udevd_CFLAGS = $(udev_common_CFLAGS) +udev_udevd_LDADD = $(udev_common_LDADD) udev_udevadm_SOURCES = \ $(udev_common_sources) \ @@ -186,7 +234,8 @@ udev_udevadm_SOURCES = \ udev/udevadm-trigger.c \ udev/udevadm-test.c \ udev/udevadm-test-builtin.c -udev_udevadm_LDADD = libudev/libudev-private.la +udev_udevadm_CFLAGS = $(udev_common_CFLAGS) +udev_udevadm_LDADD = $(udev_common_LDADD) # ------------------------------------------------------------------------------ # udev man pages @@ -227,7 +276,8 @@ libudev_test_libudev_LDADD = libudev/libudev.la udev_test_udev_SOURCES = \ $(udev_common_sources) \ udev/test-udev.c -udev_test_udev_LDADD = libudev/libudev-private.la +udev_test_udev_CFLAGS = $(udev_common_CFLAGS) +udev_test_udev_LDADD = $(udev_common_LDADD) # ------------------------------------------------------------------------------ # firmware - firmware loading @@ -315,7 +365,10 @@ libgudev_include_HEADERS = \ extras/gudev/gudevenumerator.h lib_LTLIBRARIES += extras/gudev/libgudev-1.0.la + pkgconfig_DATA += extras/gudev/gudev-1.0.pc +EXTRA_DIST += extras/gudev/gudev-1.0.pc.in +CLEANFILES += extras/gudev/gudev-1.0.pc extras_gudev_libgudev_1_0_la_SOURCES = \ extras/gudev/gudevenums.h \ @@ -330,12 +383,12 @@ extras_gudev_libgudev_1_0_la_SOURCES = \ extras/gudev/gudevenumerator.c \ extras/gudev/gudevprivate.h -dist_extras_gudev_libgudev_1_0_la_SOURCES = \ +nodist_extras_gudev_libgudev_1_0_la_SOURCES = \ extras/gudev/gudevmarshal.h \ extras/gudev/gudevmarshal.c \ extras/gudev/gudevenumtypes.h \ extras/gudev/gudevenumtypes.c -BUILT_SOURCES += $(dist_extras_gudev_libgudev_1_0_la_SOURCES) +BUILT_SOURCES += $(nodist_extras_gudev_libgudev_1_0_la_SOURCES) extras_gudev_libgudev_1_0_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ @@ -469,16 +522,24 @@ nodist_extras_keymap_keymap_SOURCES = \ extras/keymap/keys-to-name.h BUILT_SOURCES += $(nodist_extras_keymap_keymap_SOURCES) -EXTRA_DIST += extras/keymap/check-keymaps.sh -dist_udevrules_DATA += extras/keymap/95-keymap.rules -dist_udevrules_DATA += extras/keymap/95-keyboard-force-release.rules libexec_PROGRAMS += extras/keymap/keymap -dist_libexec_SCRIPTS += extras/keymap/findkeyboards -dist_libexec_SCRIPTS += extras/keymap/keyboard-force-release.sh dist_doc_DATA = extras/keymap/README.keymap.txt + +dist_udevrules_DATA += \ + extras/keymap/95-keymap.rules \ + extras/keymap/95-keyboard-force-release.rules + +dist_libexec_SCRIPTS += extras/keymap/findkeyboards +libexec_SCRIPTS += extras/keymap/keyboard-force-release.sh + +EXTRA_DIST += \ + extras/keymap/check-keymaps.sh \ + extras/keymap/keyboard-force-release.sh.in + CLEANFILES += \ extras/keymap/keys.txt \ - extras/keymap/keys-from-name.gperf + extras/keymap/keys-from-name.gperf \ + extras/keymap/keyboard-force-release.sh udevkeymapdir = $(libexecdir)/keymaps dist_udevkeymap_DATA = \ @@ -639,14 +700,13 @@ clean-local: distclean-local: rm -rf autom4te.cache +EXTRA_DIST += \ + $(TESTS) \ + test/rule-syntax-check.py + CLEANFILES += \ - udev-$(VERSION).tar.gz \ - udev-$(VERSION).tar.bz2 \ $(BUILT_SOURCES) -EXTRA_DIST += $(TESTS) -EXTRA_DIST += test/rule-syntax-check.py - install-exec-hook: $(INSTALL_EXEC_HOOKS) install-data-hook: $(INSTALL_DATA_HOOKS) @@ -685,15 +745,14 @@ git-release: tar: make distcheck - gpg --armor --detach-sign udev-$(VERSION).tar.gz - gpg --armor --detach-sign udev-$(VERSION).tar.bz2 + gpg --armor --detach-sign udev-$(VERSION).tar.xz git-sync: git push git push --tags $(VERSION) tar-sync: - scp udev-$(VERSION).tar.gz master.kernel.org:/pub/linux/utils/kernel/hotplug/ + scp udev-$(VERSION).tar.xz master.kernel.org:/pub/linux/utils/kernel/hotplug/ doc-sync: rsync -av udev/*.html master.kernel.org:/pub/linux/utils/kernel/hotplug/udev/