diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-08-15 17:50:35 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-08-15 17:52:58 +0100 |
commit | 8446850029110327be1aa428e393ce238816db08 (patch) | |
tree | d91fa1e29aff67e5b95684ecd13bf4947cba302d | |
parent | bad11b6419d7b1441a5c4091c772d20a46a7fcff (diff) |
Set autogen.sh executable, use git in dist-hook, replace _boring with .gitignore
-rw-r--r-- | .gitignore | 61 | ||||
-rw-r--r-- | Makefile.am | 5 | ||||
-rw-r--r-- | _boring | 92 | ||||
-rwxr-xr-x[-rw-r--r--] | autogen.sh | 0 |
4 files changed, 65 insertions, 93 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..c3cfa5a42 --- /dev/null +++ b/.gitignore @@ -0,0 +1,61 @@ +*.[ao] +*.l[ao] +*.loT +*.orig +*.pc +*.py[co] +*.rej +*.sw[op] +*~ +.DS_Store +.deps +.libs +.svn +INSTALL +Makefile +Makefile.in +_gen +aclocal.m4 +autom4te.cache +compile +config.cache +config.guess +config.h +config.h.in +config.log +config.status +config.sub +configure +core +data/gabble.manager +data/org.freedesktop.Telepathy.ConnectionManager.gabble.service +debian +depcomp +docs/*.html +docs/telepathy-gabble.8 +extensions/extensions.html +gtk-doc.make +install-sh +libtool +ltmain.sh +m4/gtk-doc.m4 +missing +src/gabble-signals-marshal.list +src/telepathy-gabble +src/write-mgr-file +stamp-h1 +tags +telepathy-gabble-0* +tests/org.freedesktop.Telepathy.ConnectionManager.gabble.service +tests/test-base64 +tests/test-dtube-unique-names +tests/test-handles +tests/test-jid-decode +tests/test-parse-message +tests/test-presence +tests/twisted/gabbleconfig.py +tests/twisted/telepathy-gabble-debug +tests/twisted/tools/*.service +tests/twisted/tools/exec-with-log.sh +tests/twisted/tools/gabble-testing.log +tests/twisted/tools/tmp-session-bus.conf diff --git a/Makefile.am b/Makefile.am index 77c2b7d63..bdd1018d9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,10 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-debug dist-hook: chmod u+w ${distdir}/ChangeLog - if test -d _darcs; then darcs changes >${distdir}/ChangeLog; fi + if test -d ${top_srcdir}/.git; then \ + git log --stat > ${distdir}/ChangeLog || \ + git log > ${distdir}/ChangeLog; \ + fi check-twisted: all $(MAKE) -C tests/twisted check-twisted diff --git a/_boring b/_boring deleted file mode 100644 index 7f14943d7..000000000 --- a/_boring +++ /dev/null @@ -1,92 +0,0 @@ -# Boring file regexps: -\.hi$ -\.o$ -\.loT?$ -\.o\.cmd$ -\.ko$ -\.ko\.cmd$ -\.mod\.c$ -(^|/)\.tmp_versions($|/) -(^|/)CVS($|/) -(^|/)RCS($|/) -~$ -#(^|/)\.[^/] -(^|/)_darcs($|/) -\.bak$ -\.BAK$ -\.orig$ -\.rej$ -(^|/)vssver\.scc$ -\.swp$ -\.swo$ -(^|/)MT($|/) -(^|/)\{arch\}($|/) -(^|/).arch-ids($|/) -(^|/), -\.class$ -\.prof$ -(^|/)\.DS_Store$ -(^|/)BitKeeper($|/) -(^|/)ChangeSet($|/) -(^|/)\.svn($|/) -\.py[co]$ -\# -\.cvsignore$ -(^|/)Thumbs\.db$ -(^|/)Makefile$ -(^|/)Makefile.in$ -^INSTALL$ -^aclocal.m4$ -^autom4te.cache($|/) -^config.guess$ -^config.cache$ -^config.h$ -^config.h.in$ -^config.log$ -^config.status$ -^config.sub$ -^configure$ -^install-sh$ -^libtool$ -^ltmain.sh$ -^missing$ -^stamp-h1$ -^depcomp$ -^compile$ -^gtk-doc\.make$ -^m4/gtk-doc\.m4$ -(^|/).deps($|/) -(^|/).libs($|/) -\.lo$ -\.la$ -\-glue.(c|h)$ -\-marshal.(c|h)$ -\-enumtypes.(c|h)$ -\-bindings.(c|h)$ -\-gen.h$ -\.pc$ -^data/gabble.manager$ -^(data|tests)/org.freedesktop.Telepathy.ConnectionManager.gabble.service$ -^src/gabble-signals-marshal\.list$ -^src/telepathy-gabble$ -^src/write-mgr-file$ -^src/gabble-signals-marshal.list$ -^tests/gabble-testing\.log$ -^tests/run-with-tmp-session-bus\.conf$ -(^|/)cscope\.out$ -(^|/)core$ -^debian($|/) -^tags$ -^telepathy-gabble-0 -^tests/twisted/gabbleconfig\.py$ -^tests/twisted/telepathy-gabble-debug$ -^tests/twisted/tools/gabble-testing\.log$ -^tests/twisted/tools/exec-with-log\.sh$ -^tests/twisted/tools/.*\.service$ -^tests/twisted/tools/tmp-session-bus\.conf$ -^tests/test-[-a-z0-9]*$ -^extensions/_gen($|/) -^extensions/extensions\.html$ -^docs/.*\.html$ -^docs/xep\.xsl$ -^docs/telepathy-gabble\.8$ diff --git a/autogen.sh b/autogen.sh index 7f08e9b68..7f08e9b68 100644..100755 --- a/autogen.sh +++ b/autogen.sh |