[PATCH 2/4] gitignore: enable git.mk usage

Mon Jun 1 17:50:44 UTC 2020

From: You-Sheng Yang <vicamo at gmail.com>

Now that gitignore files will be generated along with other built files,
they can be removed safely.

Signed-off-by: You-Sheng Yang <vicamo at gmail.com>
---
 .gitignore                          | 40 -----------------------------
 Makefile.am                         |  8 ++++++
 data/Makefile.am                    |  2 ++
 efi_runtime/.gitignore              |  4 ---
 m4/.gitignore                       |  2 --
 scripts/bash-completion/Makefile.am |  2 ++
 src/Makefile.am                     |  2 ++
 src/acpica/.gitignore               | 16 ------------
 src/lib/Makefile.am                 |  2 ++
 src/lib/src/Makefile.am             |  2 ++
 src/libfwtsacpica/Makefile.am       |  2 ++
 src/libfwtsiasl/Makefile.am         |  2 ++
 src/utilities/Makefile.am           |  2 ++
 13 files changed, 24 insertions(+), 62 deletions(-)
 delete mode 100644 .gitignore
 delete mode 100644 efi_runtime/.gitignore
 delete mode 100644 m4/.gitignore
 delete mode 100644 src/acpica/.gitignore

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index add5f0b4..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,40 +0,0 @@
-*~
-.*
-*.o
-*.lo
-*.swp
-*.dsl
-0*.patch
-test-suite.log
-Makefile
-Makefile.in
-/aclocal.m4
-/autom4te.cache
-/configure
-/ar-lib
-/compile
-/config.guess
-/config.h
-/config.h.in
-/config.log
-/config.status
-/config.sub
-/depcomp
-/install-sh
-/libtool
-/ltmain.sh
-/missing
-/stamp-h1
-test-driver
-results.log
-debian/*.debhelper.log
-debian/autoreconf.after
-debian/autoreconf.before
-src/fwts
-src/lib/src/libfwts.la
-src/utilities/kernelscan
-fwts-test/*/*.sh.trs
-fwts-test/*/*.sh.log
-fedora/fwts.spec
-fedora/rpm
-src/acpica/source/compiler/aslcompiler.y
diff --git a/Makefile.am b/Makefile.am
index 5c0aebde..c013ffb1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,6 +16,12 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 
+MAINTAINERCLEANFILES = \
+	$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
+	$(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
+	$(GITIGNORE_MAINTAINERCLEANFILES_M4_GETTEXT) \
+	$(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL)
+
 SUBDIRS = src data src/utilities scripts/bash-completion
 
 ACLOCAL_AMFLAGS = -I m4
@@ -174,3 +180,5 @@ TESTS = fwts-test/acpidump-0001/test-0001.sh \
 	fwts-test/xenv-0001/test-0001.sh \
 	fwts-test/xenv-0001/test-0002.sh \
 	fwts-test/xsdt-0001/test-0001.sh
+
+-include $(top_srcdir)/git.mk
diff --git a/data/Makefile.am b/data/Makefile.am
index 2b564725..10e2d070 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -18,3 +18,5 @@
 
 fwtsdatadir = $(pkgdatadir)
 fwtsdata_DATA = clog.json klog.json syntaxcheck.json olog.json
+
+-include $(top_srcdir)/git.mk
diff --git a/efi_runtime/.gitignore b/efi_runtime/.gitignore
deleted file mode 100644
index a4b501b4..00000000
--- a/efi_runtime/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Module.symvers
-efi_runtime.ko
-efi_runtime.mod.c
-modules.order
diff --git a/m4/.gitignore b/m4/.gitignore
deleted file mode 100644
index d6b7ef32..00000000
--- a/m4/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/scripts/bash-completion/Makefile.am b/scripts/bash-completion/Makefile.am
index a8b6ec8a..80d4acc5 100644
--- a/scripts/bash-completion/Makefile.am
+++ b/scripts/bash-completion/Makefile.am
@@ -1,2 +1,4 @@
 bashcompletiondir = @bashcompletiondir@
 dist_bashcompletion_DATA = fwts
+
+-include $(top_srcdir)/git.mk
diff --git a/src/Makefile.am b/src/Makefile.am
index e0093aef..9fb55209 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -211,3 +211,5 @@ fwts_LDADD = \
 	-lfwts
 
 man_MANS = ../doc/fwts.1 ../doc/fwts-collect.1 ../doc/fwts-frontend-text.1
+
+-include $(top_srcdir)/git.mk
diff --git a/src/acpica/.gitignore b/src/acpica/.gitignore
deleted file mode 100644
index 6b1f7847..00000000
--- a/src/acpica/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-dscontrol_munged.c
-libfwtsacpica.la
-osunixxf_munged.c
-source/compiler/aslcompiler.c
-source/compiler/aslcompiler.output
-source/compiler/aslcompiler.y.h
-source/compiler/aslcompilerlex.c
-source/compiler/dtparser.c
-source/compiler/dtparser.output
-source/compiler/dtparser.y.h
-source/compiler/dtparserlex.c
-source/compiler/libfwtsiasl.la
-source/compiler/prparser.c
-source/compiler/prparser.output
-source/compiler/prparser.y.h
-source/compiler/prparserlex.c
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 81da0a37..d05fc36c 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -17,3 +17,5 @@
 #
 
 SUBDIRS = src
+
+-include $(top_srcdir)/git.mk
diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am
index 706b18e6..ecc4136b 100644
--- a/src/lib/src/Makefile.am
+++ b/src/lib/src/Makefile.am
@@ -113,3 +113,5 @@ libfwts_la_SOURCES = 		\
 	fwts_safe_mem.c		\
 	fwts_pm_debug.c		\
 	$(dt_sources)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/libfwtsacpica/Makefile.am b/src/libfwtsacpica/Makefile.am
index 3f039fcf..320f339d 100644
--- a/src/libfwtsacpica/Makefile.am
+++ b/src/libfwtsacpica/Makefile.am
@@ -285,3 +285,5 @@ libfwtsacpica_la_SOURCES =					\
 libfwtsacpica_la_LIBADD = \
 	-L$(top_builddir)/src/lib/src -lfwts -lrt
 
+
+-include $(top_srcdir)/git.mk
diff --git a/src/libfwtsiasl/Makefile.am b/src/libfwtsiasl/Makefile.am
index 751b5bb7..f232c0db 100644
--- a/src/libfwtsiasl/Makefile.am
+++ b/src/libfwtsiasl/Makefile.am
@@ -320,3 +320,5 @@ libfwtsiasl_la_SOURCES = 					\
 	../acpica/source/components/utilities/utuuid.c		\
 	../acpica/source/components/utilities/utxface.c		\
 	../acpica/source/components/utilities/utxferror.c
+
+-include $(top_srcdir)/git.mk
diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am
index 0e840d36..98d6ebaa 100644
--- a/src/utilities/Makefile.am
+++ b/src/utilities/Makefile.am
@@ -23,3 +23,5 @@ AM_CPPFLAGS = -Wall -Werror -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \
 bin_PROGRAMS = kernelscan
 kernelscan_SOURCES = kernelscan.c
 
+
+-include $(top_srcdir)/git.mk
-- 
2.25.1


