1From 3ec4eaf1688e413e8b5cb433148a3bc6e7987606 Mon Sep 17 00:00:00 2001 2From: Khem Raj <raj.khem@gmail.com> 3Date: Thu, 29 Aug 2019 15:10:03 -0700 4Subject: [PATCH] enable out of source tree builds 5 6Signed-off-by: Khem Raj <raj.khem@gmail.com> 7--- 8 lib/efi/Makefile.am | 2 +- 9 lib/engine/Makefile.am | 2 +- 10 lib/orom/Makefile.am | 2 +- 11 lib/safeclib/Makefile.am | 2 +- 12 src/Makefile.am | 16 ++++++++-------- 13 tools/Makefile.am | 10 +++++----- 14 ut/Makefile.am | 36 ++++++++++++++++++------------------ 15 7 files changed, 35 insertions(+), 35 deletions(-) 16 17--- a/lib/efi/Makefile.am 18+++ b/lib/efi/Makefile.am 19@@ -7,6 +7,6 @@ libefi_la_SOURCES = \ 20 efi.h 21 22 libefi_la_CPPFLAGS = \ 23- -I$(top_srcdir) \ 24+ -I$(top_builddir) \ 25 -I$(top_srcdir)/include \ 26 -I$(top_srcdir)/lib 27--- a/lib/engine/Makefile.am 28+++ b/lib/engine/Makefile.am 29@@ -123,6 +123,7 @@ libengine_la_SOURCES = \ 30 volume.h 31 32 libengine_la_CPPFLAGS = \ 33+ -I$(top_builddir) \ 34 -I$(top_srcdir) \ 35 -I$(top_srcdir)/include \ 36 -I$(top_srcdir)/lib 37--- a/lib/orom/Makefile.am 38+++ b/lib/orom/Makefile.am 39@@ -7,6 +7,6 @@ liborom_la_SOURCES = \ 40 orom.h 41 42 liborom_la_CPPFLAGS = \ 43- -I$(top_srcdir) \ 44+ -I$(top_builddir) \ 45 -I$(top_srcdir)/include \ 46 -I$(top_srcdir)/lib 47--- a/lib/safeclib/Makefile.am 48+++ b/lib/safeclib/Makefile.am 49@@ -37,7 +37,7 @@ libsafec_la_SOURCES = \ 50 strtok_s.c 51 52 libsafec_la_CPPFLAGS = \ 53- -I$(top_srcdir) \ 54+ -I$(top_builddir) \ 55 -I$(top_srcdir)/include \ 56 -I$(top_srcdir)/lib \ 57 -Wno-unused-variable 58--- a/src/Makefile.am 59+++ b/src/Makefile.am 60@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = nostdinc 61 lib_LTLIBRARIES = libssi.la 62 63 libssi_la_CPPFLAGS = \ 64- -I$(top_srcdir) \ 65+ -I$(top_builddir) \ 66 -I$(top_srcdir)/include \ 67 -I$(top_srcdir)/lib \ 68 -DBOOST_NO_USER_CONFIG 69@@ -46,10 +46,10 @@ libssi_la_SOURCES = 70 templates.h \ 71 volume.cpp 72 73-libssi_la_LIBADD = \ 74- ../lib/efi/libefi.la \ 75- ../lib/log/liblog.la \ 76- ../lib/orom/liborom.la \ 77- ../lib/mpb/libmpb.la \ 78- ../lib/engine/libengine.la \ 79- ../lib/safeclib/libsafec.la 80+libssi_la_LIBADD = \ 81+ $(top_builddir)/lib/efi/libefi.la \ 82+ $(top_builddir)/lib/log/liblog.la \ 83+ $(top_builddir)/lib/orom/liborom.la \ 84+ $(top_builddir)/lib/mpb/libmpb.la \ 85+ $(top_builddir)/lib/engine/libengine.la \ 86+ $(top_builddir)/lib/safeclib/libsafec.la 87--- a/tools/Makefile.am 88+++ b/tools/Makefile.am 89@@ -6,17 +6,18 @@ ssimsg_SOURCES = 90 ssimsg.cpp 91 92 ssimsg_CPPFLAGS = \ 93- -I$(top_srcdir) \ 94+ -I$(top_builddir) \ 95 -I$(top_srcdir)/include \ 96 -I$(top_srcdir)/lib 97 98-ssieventmonitor_SOURCES = \ 99+ssieventmonitor_SOURCES = \ 100 ssieventmonitor.cpp 101 102-ssieventmonitor_CPPFLAGS = \ 103+ssieventmonitor_CPPFLAGS = \ 104+ -I$(top_builddir) \ 105 -I$(top_srcdir) \ 106 -I$(top_srcdir)/include \ 107 -I$(top_srcdir)/lib 108 109 ssieventmonitor_LDADD = \ 110- $(top_srcdir)/lib/safeclib/libsafec.la 111+ $(top_builddir)/lib/safeclib/libsafec.la 112--- a/ut/Makefile.am 113+++ b/ut/Makefile.am 114@@ -8,81 +8,81 @@ ut_events_SOURCES = \ 115 ut_events.cpp 116 117 ut_events_CPPFLAGS = \ 118- -I$(top_srcdir) \ 119+ -I$(top_builddir) \ 120 -I$(top_srcdir)/include 121 122 ut_events_LDADD = \ 123- ../src/libssi.la 124+ $(top_builddir)/src/libssi.la 125 126 ut_volume_SOURCES = \ 127 ut_volume.cpp 128 129 ut_volume_CPPFLAGS = \ 130- -I$(top_srcdir) \ 131+ -I$(top_builddir) \ 132 -I$(top_srcdir)/include 133 134 ut_volume_LDADD = \ 135- ../src/libssi.la 136+ $(top_builddir)/src/libssi.la 137 138 ut_session_SOURCES = \ 139 ut_session.cpp 140 141 ut_session_CPPFLAGS = \ 142- -g3 -I$(top_srcdir) \ 143+ -g3 -I$(top_builddir) \ 144 -I$(top_srcdir)/include 145 146 ut_session_LDADD = \ 147- ../src/libssi.la 148+ $(top_builddir)/src/libssi.la 149 150 ut_info_SOURCES = \ 151 ut_info.cpp 152 153 ut_info_CPPFLAGS = \ 154- -g3 -I$(top_srcdir) \ 155+ -g3 -I$(top_builddir) \ 156 -I$(top_srcdir)/include 157 158 ut_info_LDADD = \ 159- ../src/libssi.la 160+ $(top_builddir)/src/libssi.la 161 162 ut_markasspare_SOURCES = \ 163 ut_markasspare.cpp 164 165 ut_markasspare_CPPFLAGS = \ 166- -g3 -I$(top_srcdir) \ 167+ -g3 -I$(top_builddir) \ 168 -I$(top_srcdir)/include 169 170 ut_markasspare_LDADD = \ 171- ../src/libssi.la 172+ $(top_builddir)/src/libssi.la 173 174 ut_migration_SOURCES = \ 175 ut_migration.cpp 176 177 ut_migration_CPPFLAGS = \ 178- -g3 -I$(top_srcdir) \ 179+ -g3 -I$(top_builddir) \ 180 -I$(top_srcdir)/include 181 182 ut_migration_LDADD = \ 183- ../src/libssi.la 184+ $(top_builddir)/src/libssi.la 185 186 ut_phy_SOURCES = \ 187 ut_phy.cpp 188 189 ut_phy_CPPFLAGS = \ 190- -g3 -I$(top_srcdir) \ 191+ -g3 -I$(top_builddir) \ 192 -I$(top_srcdir)/include 193 194 ut_phy_LDADD = \ 195- ../src/libssi.la 196+ $(top_builddir)/src/libssi.la 197 198 ut_initialize_volume_SOURCES = \ 199 ut_initialize_volume.cpp 200 201 ut_initialize_volume_CPPFLAGS = \ 202- -g3 -I$(top_srcdir) \ 203+ -g3 -I$(top_builddir) \ 204 -I$(top_srcdir)/include 205 206 ut_initialize_volume_LDADD = \ 207- ../src/libssi.la 208+ $(top_builddir)/src/libssi.la 209 210 ut_filesystem_SOURCES = \ 211 ut_filesystem.cpp \ 212@@ -92,7 +92,7 @@ ut_filesystem_SOURCES = \ 213 214 ut_filesystem_CPPFLAGS = \ 215 -iquote $(top_srcdir)/lib/engine \ 216- -I$(top_srcdir) \ 217+ -I$(top_builddir) \ 218 -I$(top_srcdir)/include 219 220 ut_string_SOURCES = \ 221@@ -103,6 +103,6 @@ ut_string_SOURCES = \ 222 223 ut_string_CPPFLAGS = \ 224 -iquote $(top_srcdir)/lib/engine \ 225- -I$(top_srcdir) \ 226+ -I$(top_builddir) \ 227 -I$(top_srcdir)/include 228 229