Merge branch 'master' into journal

[elogind.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 6cfb3ed2658cbc330910f3b95a6939273b37ec89..265801ff5fc71a801f3f8b03aa609f8332d41fdf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+systemd-journalctl
+systemd-journald
+test-id128
+test-journal

 test-install
 org.freedesktop.hostname1.xml
 org.freedesktop.locale1.xml
 test-install
 org.freedesktop.hostname1.xml
 org.freedesktop.locale1.xml


@@ -58,7 +62,7 @@ systemd-initctl
 systemd
 test-engine
 test-job-type
 systemd
 test-engine
 test-job-type

-systemd-logger
+systemd-stdout-syslog-bridge

 systemctl
 systemadm
 .dirstamp
 systemctl
 systemadm
 .dirstamp


@@ -91,7 +95,7 @@ install-sh
 missing
 stamp-*
 *.stamp
 missing
 stamp-*
 *.stamp

-Makefile
+/Makefile

 ltmain.sh
 *.tar.bz2
 *.tar.gz
 ltmain.sh
 *.tar.bz2
 *.tar.gz