Merge branch 'Optimize'

[andy/viking.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 9a1d00dcb3f286d0c874a05ee51e986f6431fa62..9a7322c2d68099abf10e94df6f7ea79400696063 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,10 @@ gnome-doc-utils.m4
 /omf.make
 /viking.spec
 /xmldocs.make
+# make dist output:
+viking-*tar.bz2
+viking-*tar.gz
+viking-*zip
 
 # data/
 data/Makefile
@@ -55,6 +59,10 @@ doc/reference/viking*
 doc/reference/sgml*
 doc/reference/*stamp
 
+# help/C/
+help/C/viking.pdf
+help/C/*html
+
 # /src/
 /src/.deps
 /src/Makefile.in
@@ -66,6 +74,7 @@ doc/reference/*stamp
 /src/libviking.a
 /src/stamp-h1
 /src/viking
+/src/viking.exe
 /src/viking.desktop
 /src/vikenumtypes.h
 /src/vikenumtypes.c
@@ -98,3 +107,15 @@ doc/reference/*stamp
 /po/POTFILES
 /po/.intltool-merge-cache
 /po/stamp-it
+
+# win32/
+win32/Makefile
+win32/Makefile.in
+win32/installer/Makefile
+win32/installer/Makefile.in
+win32/installer/pixmaps/Makefile
+win32/installer/pixmaps/Makefile.in
+win32/installer/pixmaps/*o
+win32/installer/translations/Makefile
+win32/installer/translations/Makefile.in
+win32/installer/viking*.exe