From f3de7b43714e8ff771fcf838ed6accc27c21da55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Mon, 1 Jan 2024 20:52:06 +0100
Subject: [PATCH] Merge `samples/.gitignore` into `.gitignore` (#14134)

---
 .gitignore         | 1 +
 Makefile           | 1 -
 Makefile.win       | 1 -
 samples/.gitignore | 1 -
 4 files changed, 1 insertion(+), 3 deletions(-)
 delete mode 100644 samples/.gitignore

diff --git a/.gitignore b/.gitignore
index 5d74450c533f..987e8a649620 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 
 # Build artifacts
 /.build/
+/samples/.build/
 /docs/
 /src/llvm/ext/llvm_ext.o
 /src/llvm/ext/llvm_ext.obj
diff --git a/Makefile b/Makefile
index 7e8070d16921..4682c7aebec9 100644
--- a/Makefile
+++ b/Makefile
@@ -182,7 +182,6 @@ install_docs: docs ## Install docs at DESTDIR
 
 	cp -av docs "$(DATADIR)/docs"
 	cp -av samples "$(DATADIR)/examples"
-	rm -rf "$(DATADIR)/examples/.gitignore"
 
 .PHONY: uninstall_docs
 uninstall_docs: ## Uninstall docs from DESTDIR
diff --git a/Makefile.win b/Makefile.win
index e2b18741657e..da1d9fc8328a 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -171,7 +171,6 @@ install_docs: docs ## Install docs at prefix
 	$(call MKDIR,"$(DATADIR)")
 	$(call INSTALLDIR,docs,"$(DATADIR)\docs")
 	$(call INSTALLDIR,samples,"$(DATADIR)\examples")
-	$(call RM,"$(DATADIR)\examples\.gitignore")
 
 .PHONY: uninstall_docs
 uninstall_docs: ## Uninstall docs from prefix
diff --git a/samples/.gitignore b/samples/.gitignore
deleted file mode 100644
index 0e03e15f2420..000000000000
--- a/samples/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/.build/