build-sys: drop systemd- prefix from analyze dir

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index caf9ea21e057e738e6722ff0aac3234a8c743e52..57a149eb3cebfacddccc01548e1d4eaf0245d9b7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -211,7 +211,7 @@ bin_PROGRAMS = \
        systemd-detect-virt
 
 dist_bin_SCRIPTS = \
-       src/systemd-analyze
+       src/analyze/systemd-analyze
 
 rootlibexec_PROGRAMS = \
        systemd \
@@ -869,6 +869,11 @@ check_PROGRAMS += \
        test-install \
        test-watchdog
 
+TESTS += \
+       test-job-type \
+       test-env-replace \
+       test-strv
+
 test_engine_SOURCES = \
        src/test/test-engine.c
 
@@ -1428,7 +1433,8 @@ libudev_core_la_SOURCES = \
        src/udev/udev-builtin-input_id.c \
        src/udev/udev-builtin-kmod.c \
        src/udev/udev-builtin-path_id.c \
-       src/udev/udev-builtin-usb_id.c
+       src/udev/udev-builtin-usb_id.c \
+       src/libsystemd-daemon/sd-daemon.c
 
 libudev_core_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1437,7 +1443,6 @@ libudev_core_la_CFLAGS = \
 
 libudev_core_la_LIBADD = \
        libudev-private.la \
-       libsystemd-daemon.la \
        libsystemd-shared.la \
        $(BLKID_LIBS) \
        $(KMOD_LIBS)
@@ -1450,10 +1455,10 @@ libudev_core_la_CPPFLAGS = \
 if HAVE_ACL
 libudev_core_la_SOURCES += \
        src/udev/udev-builtin-uaccess.c \
-       src/login/logind-acl.c
+       src/login/logind-acl.c \
+       src/login/sd-login.c
 
 libudev_core_la_LIBADD += \
-       libsystemd-login.la \
        libsystemd-acl.la
 endif
 
@@ -1699,7 +1704,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 +1748,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:
@@ -1927,6 +1932,9 @@ test_id128_LDADD = \
 check_PROGRAMS += \
        test-id128
 
+TESTS += \
+       test-id128
+
 pkginclude_HEADERS += \
        src/systemd/sd-id128.h