Commit 81059e32 authored by Andrew Jeffery's avatar Andrew Jeffery

Makefiles: Centralise some use of VIRTUAL_PNOR_ENABLED

Better that we try to keep all the conditional junk near the top of the
tree.

Change-Id: Ic9e8dca892dcf15607bace9f630f4d107e1a4b4e
Signed-off-by: Andrew Jeffery's avatarAndrew Jeffery <andrew@aj.id.au>
parent de08ca2d
...@@ -42,7 +42,10 @@ AM_CFLAGS = $(CODE_COVERAGE_CFLAGS) ...@@ -42,7 +42,10 @@ AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
AM_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS) AM_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS)
include test/Makefile.am.include include test/Makefile.am.include
if VIRTUAL_PNOR_ENABLED
include vpnor/test/Makefile.am.include include vpnor/test/Makefile.am.include
endif
TESTS = $(check_PROGRAMS) TESTS = $(check_PROGRAMS)
......
...@@ -226,7 +226,6 @@ vpnor_test_force_readonly_toc_SOURCES = \ ...@@ -226,7 +226,6 @@ vpnor_test_force_readonly_toc_SOURCES = \
vpnor_test_force_readonly_toc_LDFLAGS = $(OESDK_TESTCASE_FLAGS) vpnor_test_force_readonly_toc_LDFLAGS = $(OESDK_TESTCASE_FLAGS)
vpnor_test_force_readonly_toc_LDADD = $(VPNOR_LDADD) vpnor_test_force_readonly_toc_LDADD = $(VPNOR_LDADD)
if VIRTUAL_PNOR_ENABLED
check_PROGRAMS += \ check_PROGRAMS += \
%reldir%/create_pnor_partition_table \ %reldir%/create_pnor_partition_table \
%reldir%/create_read_window_partition_exists \ %reldir%/create_read_window_partition_exists \
...@@ -261,4 +260,3 @@ check_PROGRAMS += \ ...@@ -261,4 +260,3 @@ check_PROGRAMS += \
XFAIL_TESTS += \ XFAIL_TESTS += \
%reldir%/write_toc %reldir%/write_toc
endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment