Skip to content

Commit ffc4efb

Browse files
committed
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.
1 parent 9a1dea8 commit ffc4efb

File tree

6 files changed

+17
-11
lines changed

6 files changed

+17
-11
lines changed

.gitignore

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,19 @@ aclocal.m4
33
AUTHORS
44
autom4te.cache/
55
ChangeLog
6+
compile
67
config_ac.h
78
config_ac-h.in
89
config.guess
910
config.log
1011
config.status
1112
config.sub
1213
configure
13-
compile
1414
depcomp
1515
.deps/
16+
genkeymap/xrdp-genkeymap
1617
install-sh
18+
keygen/xrdp-keygen
1719
*.la
1820
.libs
1921
libtool
@@ -22,18 +24,17 @@ ltmain.sh
2224
Makefile
2325
Makefile.in
2426
missing
27+
mkinstalldirs
2528
NEWS
2629
*.o
2730
README
31+
sesman/chansrv/xrdp-chansrv
32+
sesman/sessvc/xrdp-sessvc
33+
sesman/tools/xrdp-dis
34+
sesman/tools/xrdp-sesadmin
35+
sesman/tools/xrdp-sesrun
36+
sesman/tools/xrdp-sestest
37+
sesman/tools/xrdp-xcon
38+
sesman/xrdp-sesman
2839
stamp-h1
29-
xrdp-chansrv
30-
xrdp-genkeymap
31-
xrdp-keygen
32-
xrdp-sesadmin
33-
xrdp-sesman
34-
xrdp-sesrun
35-
xrdp-sessvc
36-
xrdp-sestest
37-
xrdp-dis
38-
xrdp-xcon
3940
xrdp/xrdp

fontdump/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
!Makefile

sesman/chansrv/pcsc/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
!Makefile

sesman/chansrv/pulse/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
!Makefile

tests/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
!Makefile

xorg/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
!Makefile

0 commit comments

Comments
 (0)