Skip to content

Commit 97c097a

Browse files
committed
Fixed failures in distclean target
Building stuff from libutils in test/unit causes make distclean to delete the same files twice resulting in failure. This happens as an effect of enabling subdir-objects which causes recursive builds. Ticket: CFE-2780 Signed-off-by: Lars Erik Wik <[email protected]>
1 parent 55421f4 commit 97c097a

File tree

1 file changed

+0
-31
lines changed

1 file changed

+0
-31
lines changed

tests/unit/Makefile.am

-31
Original file line numberDiff line numberDiff line change
@@ -54,37 +54,6 @@ AM_CFLAGS = $(PTHREAD_CFLAGS)
5454
check_LTLIBRARIES = libtest.la
5555
libtest_la_SOURCES = cmockery.c cmockery.h schema.h test.c test.h
5656

57-
libtest_la_LIBADD = ../../libntech/libcompat/libcompat.la
58-
59-
60-
check_LTLIBRARIES += libdb.la
61-
libdb_la_SOURCES = db_stubs.c \
62-
../../libpromises/dbm_api.c \
63-
../../libpromises/dbm_quick.c \
64-
../../libpromises/dbm_tokyocab.c \
65-
../../libpromises/dbm_lmdb.c \
66-
../../libpromises/dbm_migration.c \
67-
../../libpromises/dbm_migration_lastseen.c \
68-
../../libpromises/global_mutex.c \
69-
../../cf-check/backup.c \
70-
../../cf-check/diagnose.c \
71-
../../cf-check/lmdump.c \
72-
../../cf-check/repair.c \
73-
../../cf-check/replicate_lmdb.c \
74-
../../cf-check/utilities.c \
75-
../../cf-check/validate.c \
76-
../../libntech/libutils/logging.c \
77-
../../libntech/libutils/mutex.c \
78-
../../libntech/libutils/cleanup.c
79-
if HPUX
80-
libdb_la_SOURCES += ../../libpromises/cf3globals.c
81-
endif
82-
libdb_la_LIBADD = ../../libntech/libutils/libutils.la
83-
#libdb_la_CPPFLAGS = $(LMDB_CPPFLAGS) $(TOKYOCABINET_CPPFLAGS) $(QDBM_CPPFLAGS)
84-
# Make sure that source files are compiled to separate object files
85-
# libdb_la-file.o
86-
libdb_la_CFLAGS = $(AM_CFLAGS)
87-
8857
check_PROGRAMS = \
8958
processes_select_test \
9059
arg_split_test \

0 commit comments

Comments
 (0)