From ffc4efb9ce09ccc370571793607b19193d8cb15b Mon Sep 17 00:00:00 2001
From: Pavel Roskin <plroskin@gmail.com>
Date: Tue, 9 Feb 2016 21:10:30 -0800
Subject: [PATCH] Don't ignore files known to git

That can cause unexpected behavior, especially with third party tools.
The ignored files will be lost if the source tree is re-imported to
another git repository, unless special care is taken.

Whitelist all non-generated makefiles.

To whitelist instfiles/pam.d/xrdp-sesman, add path to all generated
executables listed in the top-level .gitignore, sort .gitignore
alphabetically.

Add mkinstalldir, it's used by Automake on some systems.
---
 .gitignore                      | 23 ++++++++++++-----------
 fontdump/.gitignore             |  1 +
 sesman/chansrv/pcsc/.gitignore  |  1 +
 sesman/chansrv/pulse/.gitignore |  1 +
 tests/.gitignore                |  1 +
 xorg/.gitignore                 |  1 +
 6 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 fontdump/.gitignore
 create mode 100644 sesman/chansrv/pcsc/.gitignore
 create mode 100644 sesman/chansrv/pulse/.gitignore
 create mode 100644 tests/.gitignore
 create mode 100644 xorg/.gitignore

diff --git a/.gitignore b/.gitignore
index 0437bf57..e7ca1e6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ aclocal.m4
 AUTHORS
 autom4te.cache/
 ChangeLog
+compile
 config_ac.h
 config_ac-h.in
 config.guess
@@ -10,10 +11,11 @@ config.log
 config.status
 config.sub
 configure
-compile
 depcomp
 .deps/
+genkeymap/xrdp-genkeymap
 install-sh
+keygen/xrdp-keygen
 *.la
 .libs
 libtool
@@ -22,18 +24,17 @@ ltmain.sh
 Makefile
 Makefile.in
 missing
+mkinstalldirs
 NEWS
 *.o
 README
+sesman/chansrv/xrdp-chansrv
+sesman/sessvc/xrdp-sessvc
+sesman/tools/xrdp-dis
+sesman/tools/xrdp-sesadmin
+sesman/tools/xrdp-sesrun
+sesman/tools/xrdp-sestest
+sesman/tools/xrdp-xcon
+sesman/xrdp-sesman
 stamp-h1
-xrdp-chansrv
-xrdp-genkeymap
-xrdp-keygen
-xrdp-sesadmin
-xrdp-sesman
-xrdp-sesrun
-xrdp-sessvc
-xrdp-sestest
-xrdp-dis
-xrdp-xcon
 xrdp/xrdp
diff --git a/fontdump/.gitignore b/fontdump/.gitignore
new file mode 100644
index 00000000..24600083
--- /dev/null
+++ b/fontdump/.gitignore
@@ -0,0 +1 @@
+!Makefile
diff --git a/sesman/chansrv/pcsc/.gitignore b/sesman/chansrv/pcsc/.gitignore
new file mode 100644
index 00000000..24600083
--- /dev/null
+++ b/sesman/chansrv/pcsc/.gitignore
@@ -0,0 +1 @@
+!Makefile
diff --git a/sesman/chansrv/pulse/.gitignore b/sesman/chansrv/pulse/.gitignore
new file mode 100644
index 00000000..24600083
--- /dev/null
+++ b/sesman/chansrv/pulse/.gitignore
@@ -0,0 +1 @@
+!Makefile
diff --git a/tests/.gitignore b/tests/.gitignore
new file mode 100644
index 00000000..24600083
--- /dev/null
+++ b/tests/.gitignore
@@ -0,0 +1 @@
+!Makefile
diff --git a/xorg/.gitignore b/xorg/.gitignore
new file mode 100644
index 00000000..24600083
--- /dev/null
+++ b/xorg/.gitignore
@@ -0,0 +1 @@
+!Makefile