From a6582531dca0b30506eb258ca711d9f80fa0dca2 Mon Sep 17 00:00:00 2001 From: Andrew Jeffery Date: Thu, 22 Feb 2018 16:04:37 +1030 Subject: test: vpnor: Reduce clutter by defining VPNOR_LDADD Define a new variable to capture the library requirements of the vpnor tests. Change-Id: I966f699a9a96ee943602476d1d1015347cfe9c0b Signed-off-by: Andrew Jeffery --- test/vpnor/Makefile.am.include | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/test/vpnor/Makefile.am.include b/test/vpnor/Makefile.am.include index 5dfccaa..13d76ea 100644 --- a/test/vpnor/Makefile.am.include +++ b/test/vpnor/Makefile.am.include @@ -1,14 +1,16 @@ TEST_MBOX_VPNOR_SRCS = common.c pnor_partition_table.cpp \ %reldir%/tmpd.cpp +VPNOR_LDADD = -lstdc++fs \ + $(SDBUSPLUS_LIBS) \ + $(PHOSPHOR_LOGGING_LIBS) \ + $(PHOSPHOR_DBUS_INTERFACES_LIBS) + test_vpnor_create_pnor_partition_table_SOURCES = \ $(TEST_MBOX_VPNOR_SRCS) \ %reldir%/create_pnor_partition_table.cpp test_vpnor_create_pnor_partition_table_LDFLAGS = $(OESDK_TESTCASE_FLAGS) -test_vpnor_create_pnor_partition_table_LDADD = -lstdc++fs \ - $(SDBUSPLUS_LIBS) \ - $(PHOSPHOR_LOGGING_LIBS) \ - $(PHOSPHOR_DBUS_INTERFACES_LIBS) +test_vpnor_create_pnor_partition_table_LDADD = $(VPNOR_LDADD) test_vpnor_create_read_window_vpnor_SOURCES = \ $(TEST_MBOX_VPNOR_SRCS) $(TEST_MOCK_SRCS) \ @@ -21,10 +23,7 @@ test_vpnor_create_read_window_vpnor_SOURCES = \ pnor_partition.cpp \ %reldir%/create_read_window_vpnor.cpp test_vpnor_create_read_window_vpnor_LDFLAGS = $(OESDK_TESTCASE_FLAGS) -test_vpnor_create_read_window_vpnor_LDADD = -lstdc++fs \ - $(SDBUSPLUS_LIBS) \ - $(PHOSPHOR_LOGGING_LIBS) \ - $(PHOSPHOR_DBUS_INTERFACES_LIBS) +test_vpnor_create_read_window_vpnor_LDADD = $(VPNOR_LDADD) test_vpnor_write_flash_vpnor_SOURCES = \ $(TEST_MBOX_VPNOR_SRCS) \ @@ -34,10 +33,7 @@ test_vpnor_write_flash_vpnor_SOURCES = \ pnor_partition.cpp \ %reldir%/write_flash_vpnor.cpp test_vpnor_write_flash_vpnor_LDFLAGS = $(OESDK_TESTCASE_FLAGS) -test_vpnor_write_flash_vpnor_LDADD = -lstdc++fs \ - $(SDBUSPLUS_LIBS) \ - $(PHOSPHOR_LOGGING_LIBS) \ - $(PHOSPHOR_DBUS_INTERFACES_LIBS) +test_vpnor_write_flash_vpnor_LDADD = $(VPNOR_LDADD) if VIRTUAL_PNOR_ENABLED check_PROGRAMS += \ -- cgit v1.2.1