diff options
| author | Andrew Jeffery <andrew@aj.id.au> | 2019-03-19 14:53:01 +1030 |
|---|---|---|
| committer | Andrew Jeffery <andrew@aj.id.au> | 2019-03-19 16:41:19 +1030 |
| commit | 81059e32dfd5e8e629f30bb55f40ade65f2b0953 (patch) | |
| tree | 06ce4810e98da44194ba8ac62f6f6ffdb7d473af | |
| parent | de08ca2d69609f58e7787620f13d3b05c19697e5 (diff) | |
| download | phosphor-mboxbridge-81059e32dfd5e8e629f30bb55f40ade65f2b0953.tar.gz phosphor-mboxbridge-81059e32dfd5e8e629f30bb55f40ade65f2b0953.zip | |
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 <andrew@aj.id.au>
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | vpnor/test/Makefile.am.include | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 27d63a4..0266a53 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,7 +42,10 @@ AM_CFLAGS = $(CODE_COVERAGE_CFLAGS) AM_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS) include test/Makefile.am.include + +if VIRTUAL_PNOR_ENABLED include vpnor/test/Makefile.am.include +endif TESTS = $(check_PROGRAMS) diff --git a/vpnor/test/Makefile.am.include b/vpnor/test/Makefile.am.include index de081fd..3e2edaa 100644 --- a/vpnor/test/Makefile.am.include +++ b/vpnor/test/Makefile.am.include @@ -226,7 +226,6 @@ vpnor_test_force_readonly_toc_SOURCES = \ vpnor_test_force_readonly_toc_LDFLAGS = $(OESDK_TESTCASE_FLAGS) vpnor_test_force_readonly_toc_LDADD = $(VPNOR_LDADD) -if VIRTUAL_PNOR_ENABLED check_PROGRAMS += \ %reldir%/create_pnor_partition_table \ %reldir%/create_read_window_partition_exists \ @@ -261,4 +260,3 @@ check_PROGRAMS += \ XFAIL_TESTS += \ %reldir%/write_toc -endif |
