Skip to content

Commit 32872f6

Browse files
committed
Remove references to top_sourcedir in Makefile.am
I don't know why, but this was necessary, and all the other tests does this. I was getting the following errors after enabling subdir-objects in `AM_INIT_AUTOMAKE`: ``` Makefile:1843: ../../cf-upgrade/.deps/cf_upgrade_test-alloc-mini.Po: No such file or directory Makefile:1844: ../../cf-upgrade/.deps/cf_upgrade_test-command_line.Po: No such file or directory Makefile:1845: ../../cf-upgrade/.deps/cf_upgrade_test-configuration.Po: No such file or directory Makefile:1846: ../../cf-upgrade/.deps/cf_upgrade_test-log.Po: No such file or directory Makefile:1847: ../../cf-upgrade/.deps/cf_upgrade_test-process.Po: No such file or directory Makefile:1848: ../../cf-upgrade/.deps/cf_upgrade_test-update.Po: No such file or directory ``` Ticket: CFE-2780 Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
1 parent e509fc6 commit 32872f6

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

tests/unit/Makefile.am

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -381,17 +381,17 @@ verify_databases_test_LDADD = ../../cf-agent/libcf-agent.la libtest.la
381381
iteration_test_SOURCES = iteration_test.c
382382

383383
cf_upgrade_test_SOURCES = cf_upgrade_test.c \
384-
$(top_srcdir)/cf-upgrade/alloc-mini.c \
385-
$(top_srcdir)/cf-upgrade/alloc-mini.h \
386-
$(top_srcdir)/cf-upgrade/command_line.c \
387-
$(top_srcdir)/cf-upgrade/command_line.h \
388-
$(top_srcdir)/cf-upgrade/configuration.c \
389-
$(top_srcdir)/cf-upgrade/configuration.h \
390-
$(top_srcdir)/cf-upgrade/log.c $(top_srcdir)/cf-upgrade/log.h \
391-
$(top_srcdir)/cf-upgrade/process.c $(top_srcdir)/cf-upgrade/process.h \
392-
$(top_srcdir)/cf-upgrade/update.c \
393-
$(top_srcdir)/cf-upgrade/update.h
394-
cf_upgrade_test_CPPFLAGS = -I$(top_srcdir)/cf-upgrade -I$(top_srcdir)/libntech/libutils -I$(top_srcdir)
384+
../../cf-upgrade/alloc-mini.c \
385+
../../cf-upgrade/alloc-mini.h \
386+
../../cf-upgrade/command_line.c \
387+
../../cf-upgrade/command_line.h \
388+
../../cf-upgrade/configuration.c \
389+
../../cf-upgrade/configuration.h \
390+
../../cf-upgrade/log.c ../../cf-upgrade/log.h \
391+
../../cf-upgrade/process.c ../../cf-upgrade/process.h \
392+
../../cf-upgrade/update.c \
393+
../../cf-upgrade/update.h
394+
cf_upgrade_test_CPPFLAGS = -I../../cf-upgrade -I../../libntech/libutils -I../../
395395
cf_upgrade_test_LDADD = libtest.la ../../libntech/libcompat/libcompat.la
396396

397397
if !NT

0 commit comments

Comments
 (0)