Import Apache build roots

[shibboleth/xmltooling.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index e7dbe75..fb26b33 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-
 # /
 /build
+/build-aux
 /Debug
 /*.ncb
 /*.suo
@@ -10,6 +10,7 @@
 /config.guess
 /config.h
 /config.h.in
+/config.h.in~
 /config.log
 /config.status
 /config.sub
@@ -24,6 +25,9 @@
 /stamp-h1
 /xmltooling.spec
 /.settings
+/.autotools
+/.cproject
+/.project
 /doxyfile
 /x64
 /Portfile
@@ -31,18 +35,20 @@
 /*.opensdf
 /*.sdf
 /ipch
+/config.cache
+/xmltooling-uninstalled.pc
+/xmltooling-uninstalled.sh
+/xmltooling.pc
+/xmltooling.pc.in
 
 # /doc/
 /doc/Makefile
 /doc/Makefile.in
 
-<<<<<<< HEAD
 # /m4/
 /m4/libtool.m4
 /m4/lt*.m4
 
-=======
->>>>>>> https://issues.shibboleth.net/jira/browse/CPPXT-77
 # /schemas/
 /schemas/catalog.xml
 /schemas/Makefile
@@ -77,7 +83,3 @@
 
 # /xmltoolingtest/data/
 /xmltoolingtest/data/*.bak
-<<<<<<< HEAD
-/build-aux
-=======
->>>>>>> https://issues.shibboleth.net/jira/browse/CPPXT-77