X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=ebbee042091802e25065a54053ed3a6ff0ece5d9;hp=69811a31d51c270418d455d8ba6980f41a6e7f89;hb=9b80f05fb727edc70a305d912ab6cf1c3bdbf67e;hpb=4193534e12fb4eaf635df414970eb54ef7174513 diff --git a/Makefile.am b/Makefile.am index 69811a31d..ebbee0420 100644 --- a/Makefile.am +++ b/Makefile.am @@ -98,6 +98,8 @@ dist_dbuspolicy_DATA = dbusinterface_DATA = dist_dbussystemservice_DATA = check_PROGRAMS = +check_DATA = +noinst_PROGRAMS = TESTS = AM_CPPFLAGS = \ @@ -211,7 +213,7 @@ bin_PROGRAMS = \ systemd-detect-virt dist_bin_SCRIPTS = \ - src/systemd-analyze/systemd-analyze + src/analyze/systemd-analyze rootlibexec_PROGRAMS = \ systemd \ @@ -856,7 +858,7 @@ EXTRA_DIST += \ src/core/systemd.pc.in # ------------------------------------------------------------------------------ -check_PROGRAMS += \ +noinst_PROGRAMS += \ test-engine \ test-job-type \ test-ns \ @@ -869,6 +871,11 @@ check_PROGRAMS += \ test-install \ test-watchdog +TESTS += \ + test-job-type \ + test-env-replace \ + test-strv + test_engine_SOURCES = \ src/test/test-engine.c @@ -1482,7 +1489,7 @@ TESTS += \ src/udev/test/udev-test.pl \ src/udev/test/rules-test.sh -check_PROGRAMS += \ +noinst_PROGRAMS += \ test-libudev \ test-udev @@ -1500,7 +1507,7 @@ test_udev_LDADD = \ libudev-private.la \ libsystemd-shared.la -test_udev_DEPENDENCIES = \ +check_DATA += \ src/udev/test/sys # packed sysfs test tree @@ -1513,9 +1520,9 @@ DISTCLEAN_LOCAL_HOOKS += test-sys-distclean EXTRA_DIST += \ src/udev/test/sys.tar.xz \ - src/udev/test/rule-syntax-check.py \ src/udev/test/udev-test.pl \ - src/udev/test/rules-test.sh + src/udev/test/rules-test.sh \ + src/udev/test/rule-syntax-check.py # ------------------------------------------------------------------------------ ata_id_SOURCES = \ @@ -1699,7 +1706,7 @@ src/udev/gudev/gudevenumtypes.c: src/udev/gudev/gudevenumtypes.c.template src/ud $(AM_V_GEN)glib-mkenums --template $^ > \ $@.tmp && mv $@.tmp $@ -if ENABLE_INTROSPECTION +if HAVE_INTROSPECTION -include $(INTROSPECTION_MAKEFILE) src/udev/gudev/GUdev-1.0.gir: libgudev-1.0.la @@ -1743,7 +1750,7 @@ typelibs_DATA = \ src/udev/gudev/GUdev-1.0.typelib CLEANFILES += $(gir_DATA) $(typelibs_DATA) -endif # ENABLE_INTROSPECTION +endif # HAVE_INTROSPECTION # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed libgudev-install-move-hook: @@ -1804,64 +1811,64 @@ CLEANFILES += \ udevkeymapdir = $(libexecdir)/udev/keymaps dist_udevkeymap_DATA = \ - src/udev/keymap/keymaps/acer \ - src/udev/keymap/keymaps/acer-aspire_5720 \ - src/udev/keymap/keymaps/acer-aspire_8930 \ - src/udev/keymap/keymaps/acer-aspire_5920g \ - src/udev/keymap/keymaps/acer-aspire_6920 \ - src/udev/keymap/keymaps/acer-travelmate_c300 \ - src/udev/keymap/keymaps/asus \ - src/udev/keymap/keymaps/compaq-e_evo \ - src/udev/keymap/keymaps/dell \ - src/udev/keymap/keymaps/dell-latitude-xt2 \ - src/udev/keymap/keymaps/everex-xt5000 \ - src/udev/keymap/keymaps/fujitsu-amilo_li_2732 \ - src/udev/keymap/keymaps/fujitsu-amilo_pa_2548 \ - src/udev/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \ - src/udev/keymap/keymaps/fujitsu-amilo_pro_v3205 \ - src/udev/keymap/keymaps/fujitsu-amilo_si_1520 \ - src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v5 \ - src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v6 \ - src/udev/keymap/keymaps/genius-slimstar-320 \ - src/udev/keymap/keymaps/hewlett-packard \ - src/udev/keymap/keymaps/hewlett-packard-2510p_2530p \ - src/udev/keymap/keymaps/hewlett-packard-compaq_elitebook \ - src/udev/keymap/keymaps/hewlett-packard-pavilion \ - src/udev/keymap/keymaps/hewlett-packard-presario-2100 \ - src/udev/keymap/keymaps/hewlett-packard-tablet \ - src/udev/keymap/keymaps/hewlett-packard-tx2 \ - src/udev/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \ - src/udev/keymap/keymaps/inventec-symphony_6.0_7.0 \ - src/udev/keymap/keymaps/lenovo-3000 \ - src/udev/keymap/keymaps/lenovo-ideapad \ - src/udev/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \ - src/udev/keymap/keymaps/lenovo-thinkpad_x6_tablet \ - src/udev/keymap/keymaps/lenovo-thinkpad_x200_tablet \ - src/udev/keymap/keymaps/lg-x110 \ - src/udev/keymap/keymaps/logitech-wave \ - src/udev/keymap/keymaps/logitech-wave-cordless \ - src/udev/keymap/keymaps/logitech-wave-pro-cordless \ - src/udev/keymap/keymaps/maxdata-pro_7000 \ - src/udev/keymap/keymaps/medion-fid2060 \ - src/udev/keymap/keymaps/medionnb-a555 \ - src/udev/keymap/keymaps/micro-star \ - src/udev/keymap/keymaps/module-asus-w3j \ - src/udev/keymap/keymaps/module-ibm \ - src/udev/keymap/keymaps/module-lenovo \ - src/udev/keymap/keymaps/module-sony \ - src/udev/keymap/keymaps/module-sony-old \ - src/udev/keymap/keymaps/module-sony-vgn \ - src/udev/keymap/keymaps/olpc-xo \ - src/udev/keymap/keymaps/onkyo \ - src/udev/keymap/keymaps/oqo-model2 \ - src/udev/keymap/keymaps/samsung-other \ - src/udev/keymap/keymaps/samsung-90x3a \ - src/udev/keymap/keymaps/samsung-sq1us \ - src/udev/keymap/keymaps/samsung-sx20s \ - src/udev/keymap/keymaps/toshiba-satellite_a100 \ - src/udev/keymap/keymaps/toshiba-satellite_a110 \ - src/udev/keymap/keymaps/toshiba-satellite_m30x \ - src/udev/keymap/keymaps/zepto-znote + keymaps/acer \ + keymaps/acer-aspire_5720 \ + keymaps/acer-aspire_8930 \ + keymaps/acer-aspire_5920g \ + keymaps/acer-aspire_6920 \ + keymaps/acer-travelmate_c300 \ + keymaps/asus \ + keymaps/compaq-e_evo \ + keymaps/dell \ + keymaps/dell-latitude-xt2 \ + keymaps/everex-xt5000 \ + keymaps/fujitsu-amilo_li_2732 \ + keymaps/fujitsu-amilo_pa_2548 \ + keymaps/fujitsu-amilo_pro_edition_v3505 \ + keymaps/fujitsu-amilo_pro_v3205 \ + keymaps/fujitsu-amilo_si_1520 \ + keymaps/fujitsu-esprimo_mobile_v5 \ + keymaps/fujitsu-esprimo_mobile_v6 \ + keymaps/genius-slimstar-320 \ + keymaps/hewlett-packard \ + keymaps/hewlett-packard-2510p_2530p \ + keymaps/hewlett-packard-compaq_elitebook \ + keymaps/hewlett-packard-pavilion \ + keymaps/hewlett-packard-presario-2100 \ + keymaps/hewlett-packard-tablet \ + keymaps/hewlett-packard-tx2 \ + keymaps/ibm-thinkpad-usb-keyboard-trackpoint \ + keymaps/inventec-symphony_6.0_7.0 \ + keymaps/lenovo-3000 \ + keymaps/lenovo-ideapad \ + keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \ + keymaps/lenovo-thinkpad_x6_tablet \ + keymaps/lenovo-thinkpad_x200_tablet \ + keymaps/lg-x110 \ + keymaps/logitech-wave \ + keymaps/logitech-wave-cordless \ + keymaps/logitech-wave-pro-cordless \ + keymaps/maxdata-pro_7000 \ + keymaps/medion-fid2060 \ + keymaps/medionnb-a555 \ + keymaps/micro-star \ + keymaps/module-asus-w3j \ + keymaps/module-ibm \ + keymaps/module-lenovo \ + keymaps/module-sony \ + keymaps/module-sony-old \ + keymaps/module-sony-vgn \ + keymaps/olpc-xo \ + keymaps/onkyo \ + keymaps/oqo-model2 \ + keymaps/samsung-other \ + keymaps/samsung-90x3a \ + keymaps/samsung-sq1us \ + keymaps/samsung-sx20s \ + keymaps/toshiba-satellite_a100 \ + keymaps/toshiba-satellite_a110 \ + keymaps/toshiba-satellite_m30x \ + keymaps/zepto-znote udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release dist_udevkeymapforcerel_DATA = \ @@ -1924,7 +1931,10 @@ test_id128_LDADD = \ libsystemd-shared.la \ libsystemd-id128.la -check_PROGRAMS += \ +noinst_PROGRAMS += \ + test-id128 + +TESTS += \ test-id128 pkginclude_HEADERS += \ @@ -2103,7 +2113,7 @@ libsystemd-journal-uninstall-hook: UNINSTALL_EXEC_HOOKS += \ libsystemd-journal-uninstall-hook -check_PROGRAMS += \ +noinst_PROGRAMS += \ test-journal \ test-journal-send @@ -2626,7 +2636,7 @@ test_login_LDADD = \ libsystemd-login.la \ libsystemd-shared.la -check_PROGRAMS += \ +noinst_PROGRAMS += \ test-login libsystemd_login_la_SOURCES = \