Merge pull request #2131 from evverx/regenerate-m4-on-reconfigure

[thirdparty/systemd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2f619cdeca2c075721d5014c55fa7a329154d925..e895bc8cec1dd44bceee2eee533a16ec24dc0f8c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -841,6 +841,8 @@ libbasic_la_SOURCES = \
        src/basic/mempool.h \
        src/basic/hashmap.c \
        src/basic/hashmap.h \
+       src/basic/hash-funcs.c \
+       src/basic/hash-funcs.h \
        src/basic/siphash24.c \
        src/basic/siphash24.h \
        src/basic/set.h \
@@ -1054,7 +1056,9 @@ libshared_la_SOURCES = \
        src/shared/machine-image.c \
        src/shared/machine-image.h \
        src/shared/machine-pool.c \
-       src/shared/machine-pool.h
+       src/shared/machine-pool.h \
+       src/shared/resolve-util.c \
+       src/shared/resolve-util.h
 
 if HAVE_UTMP
 libshared_la_SOURCES += \
@@ -2413,6 +2417,11 @@ nodist_sysusers_DATA = \
        sysusers.d/systemd.conf \
        sysusers.d/basic.conf
 
+if HAVE_REMOTE
+nodist_sysusers_DATA += \
+       sysusers.d/systemd-remote.conf
+endif
+
 INSTALL_DIRS += \
        $(sysusersdir)
 endif
@@ -2420,6 +2429,7 @@ endif
 EXTRA_DIST += \
        units/systemd-sysusers.service.in \
        sysusers.d/systemd.conf.m4 \
+       sysusers.d/systemd-remote.conf.m4 \
        sysusers.d/basic.conf.in
 
 # ------------------------------------------------------------------------------
@@ -3738,6 +3748,7 @@ EXTRA_DIST += \
        hwdb/sdio.ids
 
 # ------------------------------------------------------------------------------
+if ENABLE_TESTS
 TESTS += \
        test/udev-test.pl
 
@@ -3750,6 +3761,7 @@ TESTS += \
        test/sysv-generator-test.py
 endif
 endif
+endif
 
 manual_tests += \
        test-libudev \
@@ -3769,8 +3781,10 @@ test_udev_LDADD = \
        $(BLKID_LIBS) \
        $(KMOD_LIBS)
 
+if ENABLE_TESTS
 check_DATA += \
        test/sys
+endif
 
 # packed sysfs test tree
 test/sys:
@@ -3924,11 +3938,6 @@ systemd_journal_remote_CFLAGS = \
 systemd_journal_remote_LDADD += \
        $(MICROHTTPD_LIBS)
 
-if ENABLE_SYSUSERS
-dist_sysusers_DATA += \
-       sysusers.d/systemd-remote.conf
-endif
-
 if ENABLE_TMPFILES
 dist_tmpfiles_DATA += \
        tmpfiles.d/systemd-remote.conf
@@ -5020,8 +5029,6 @@ systemd_pull_SOURCES = \
        src/import/pull-raw.h \
        src/import/pull-tar.c \
        src/import/pull-tar.h \
-       src/import/pull-dkr.c \
-       src/import/pull-dkr.h \
        src/import/pull-job.c \
        src/import/pull-job.h \
        src/import/pull-common.c \
@@ -5737,6 +5744,9 @@ EXTRA_DIST += \
        test/TEST-04-JOURNAL/Makefile \
        test/TEST-04-JOURNAL/test-journal.sh \
        test/TEST-04-JOURNAL/test.sh \
+       test/TEST-05-RLIMITS/Makefile \
+       test/TEST-05-RLIMITS/test-rlimits.sh \
+       test/TEST-05-RLIMITS/test.sh \
        test/test-functions
 
 EXTRA_DIST += \
@@ -6279,14 +6289,14 @@ install-tree: all
        tree $(abs_srcdir)/install-tree
 
 # Let's run all tests of the test suite, but under valgrind. Let's
-# exclude the one perl script we have in there
+# exclude perl/python/shell scripts we have in there
 .PHONY: valgrind-tests
 valgrind-tests: $(TESTS)
-       $(AM_V_GEN)for f in $(filter-out %.pl, $^); do \
+       $(AM_V_GEN)for f in $(filter-out %.pl %.py, $^); do \
                if file $$f | grep -q shell; then \
                echo -e "$${x}Skipping non-binary $$f"; else \
                echo -e "$${x}Running $$f"; \
-               libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \
+               $(LIBTOOL) --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \
                x="\n\n"; \
        done