From ace8353f3970d855380b028b0abb33fdbe348978 Mon Sep 17 00:00:00 2001
From: r0m30 <r0m30@r0m30.com>
Date: Sat, 14 Aug 2021 00:43:09 -0700
Subject: [PATCH] Modify/Update Makefile.am.

vpath support
remove .h files from sources
add silent rules support
delete some extra files in maintainer-clean
---
 Makefile.am | 71 +++++++++++++++++++++++++++--------------------------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c8517d9f..6656d593 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,51 +1,52 @@
 AUTOMAKE_OPTIONS = foreign subdir-objects
 AM_CFLAGS = -Wall -Werror -std=c11
-AM_CXXFLAGS = -Wall -Werror -std=c++11 -I./Common -I./Common/pbkdf2 -I./linux -I./LinuxPBA
-SEDUTIL_COMMON_CODE = \
-	Common/DtaAnnotatedDump.cpp Common/DtaAnnotatedDump.h \
-	Common/DtaCommand.cpp Common/DtaCommand.h \
-	Common/DtaDev.cpp Common/DtaDev.h \
-	Common/DtaDevEnterprise.cpp Common/DtaDevEnterprise.h \
-	Common/DtaDevGeneric.cpp Common/DtaDevGeneric.h \
-	Common/DtaDevOpal1.cpp Common/DtaDevOpal1.h \
-	Common/DtaDevOpal2.cpp Common/DtaDevOpal2.h \
-	Common/DtaDevOpal.cpp Common/DtaDevOpal.h \
-	Common/DtaDiskType.cpp Common/DtaDiskType.h \
-	Common/DtaHashPwd.cpp Common/DtaHashPwd.h \
-	Common/DtaHexDump.cpp Common/DtaHexDump.h \
-	Common/DtaResponse.cpp Common/DtaResponse.h \
-	Common/DtaSession.cpp Common/DtaSession.h \
-	Common/DtaStructures.h Common/log.h Common/DtaLexicon.h Common/DtaConstants.h Common/DtaEndianFixup.h \
-	Common/pbkdf2/blockwise.c Common/pbkdf2/blockwise.h Common/pbkdf2/chash.c Common/pbkdf2/chash.h Common/pbkdf2/handy.h \
-	Common/pbkdf2/hmac.c Common/pbkdf2/hmac.h Common/pbkdf2/pbkdf2.c Common/pbkdf2/pbkdf2.h Common/pbkdf2/sha1.c \
-	Common/pbkdf2/sha1.h Common/pbkdf2/tassert.h Common/pbkdf2/bitops.h
+AM_CXXFLAGS = -Wall -Werror -std=c++11 -I./linux -I$(srcdir)/Common -I$(srcdir)/Common/pbkdf2 -I$(srcdir)/linux -I$(srcdir)/LinuxPBA
+SEDUTIL_COMMON_CODE = Common/log.h \
+	Common/DtaEndianFixup.h Common/DtaStructures.h \
+	Common/DtaLexicon.h Common/DtaConstants.h \
+	Common/DtaAnnotatedDump.cpp Common/DtaCommand.cpp \
+	Common/DtaAnnotatedDump.h Common/DtaCommand.h \
+	Common/DtaDev.cpp Common/DtaDevEnterprise.cpp \
+	Common/DtaDev.h Common/DtaDevEnterprise.h \
+	Common/DtaDevGeneric.cpp Common/DtaDevOpal1.cpp \
+	Common/DtaDevGeneric.h Common/DtaDevOpal1.h \
+	Common/DtaDevOpal2.cpp Common/DtaDevOpal.cpp \
+	Common/DtaDevOpal2.h Common/DtaDevOpal.h \
+	Common/DtaDiskType.cpp Common/DtaHashPwd.cpp \
+	Common/DtaDiskType.h Common/DtaHashPwd.h \
+	Common/DtaHexDump.cpp Common/DtaResponse.cpp \
+	Common/DtaHexDump.h Common/DtaResponse.h \
+	Common/DtaSession.cpp Common/pbkdf2/blockwise.c \
+	Common/DtaSession.h Common/pbkdf2/blockwise.h \
+	Common/pbkdf2/chash.c Common/pbkdf2/hmac.c \
+	Common/pbkdf2/chash.h Common/pbkdf2/hmac.h \
+	Common/pbkdf2/pbkdf2.c Common/pbkdf2/sha1.c \
+	Common/pbkdf2/pbkdf2.h Common/pbkdf2/sha1.h \
+	Common/pbkdf2/bitops.h Common/pbkdf2/blockwise.h \
+	Common/pbkdf2/handy.h Common/pbkdf2/tassert.h 
+SEDUTIL_LINUX_CODE = \
+	linux/Version.h linux/os.h linux/DtaDevLinuxDrive.h \
+	linux/DtaDevLinuxNvme.cpp linux/DtaDevLinuxSata.cpp \
+	linux/DtaDevLinuxNvme.h linux/DtaDevLinuxSata.h \
+	linux/DtaDevOS.cpp linux/DtaDevOS.h 
 sbin_PROGRAMS = sedutil-cli linuxpba
-sedutil_cli_SOURCES = linux/Version.h Common/sedutil.cpp Common/DtaOptions.cpp Common/DtaOptions.h \
-	\
-	linux/DtaDevLinuxNvme.cpp linux/DtaDevLinuxNvme.h \
-	linux/DtaDevLinuxSata.cpp linux/DtaDevLinuxSata.h \
-	linux/DtaDevOS.cpp linux/DtaDevOS.h \
-	linux/DtaDevLinuxDrive.h linux/os.h \
+sedutil_cli_SOURCES = Common/sedutil.cpp Common/DtaOptions.cpp \
+	Common/DtaOptions.h \
+	$(SEDUTIL_LINUX_CODE) \
 	$(SEDUTIL_COMMON_CODE)
 CLEANFILES = linux/Version.h
 BUILT_SOURCES = linux/Version.h
 #
 linuxpba_SOURCES = LinuxPBA/LinuxPBA.cpp LinuxPBA/GetPassPhrase.cpp LinuxPBA/UnlockSEDs.cpp \
-	 LinuxPBA/GetPassPhrase.h LinuxPBA/UnlockSEDs.h \
-	\
-	linux/DtaDevLinuxNvme.cpp linux/DtaDevLinuxNvme.h \
-	linux/DtaDevLinuxSata.cpp linux/DtaDevLinuxSata.h \
-	linux/DtaDevOS.cpp linux/DtaDevOS.h \
-	linux/DtaDevLinuxDrive.h linux/os.h \
-	\
+	LinuxPBA/GetPassPhrase.h LinuxPBA/UnlockSEDs.h \
+	$(SEDUTIL_LINUX_CODE) \
 	$(SEDUTIL_COMMON_CODE)
 EXTRA_DIST = linux/GitVersion.sh linux/PSIDRevert_LINUX.txt linux/TestSuite.sh README.md docs/sedutil-cli.8
 man_MANS = docs/sedutil-cli.8
 linux/Version.h:
-	./linux/GitVersion.sh > linux/Version.h
+	$(srcdir)/linux/GitVersion.sh > linux/Version.h
 .INTERMEDIATE: linux/Version.h
-
-distclean-local:
+maintainer-clean-local:
 	rm config.status configure config.log
 	rm Makefile
 	rm -r autom4te.cache/