summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2013-07-13 10:17:26 -0400
committerDan Winship <danw@gnome.org>2013-07-13 10:17:26 -0400
commit75af66a37dcf564bcc9e73080e1e93f51925a7d3 (patch)
treea819a795ad7a6b7df468d3784624293c8e0f9b56
parent312dbe87cc452c2f55f53068d1c5ac59ab2be94b (diff)
downloadlibsoup-75af66a37dcf564bcc9e73080e1e93f51925a7d3.tar.gz
build: use AC_CONFIG_AUX_DIR and update .gitignore
(Primarily to move automake 1.13's test-driver out of the top level so that the tests/ subdir autocompletes correctly again.)
-rw-r--r--.gitignore17
-rw-r--r--configure.ac1
2 files changed, 4 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore
index d7c22fba..713357b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,6 @@
-*~
*.o
*.lo
*.la
-*.stamp
-*.bak
.deps
.libs
INSTALL
@@ -11,16 +8,14 @@ Makefile
Makefile.in
aclocal.m4
autom4te.cache
-config.guess
+build-aux
config.h
config.h.in
+config.h.in~
config.log
config.status
-config.sub
configure
-depcomp
-docs/reference/html-build.stamp
-docs/reference/html.stamp
+docs/reference/*.stamp
docs/reference/html
docs/reference/libsoup-2.4-decl-list.txt
docs/reference/libsoup-2.4-decl.txt
@@ -40,7 +35,6 @@ examples/get
examples/simple-httpd
examples/simple-proxy
gtk-doc.make
-install-sh
libsoup-zip
libsoup-2.4.pc
libsoup-gnome-2.4.pc
@@ -52,25 +46,20 @@ libsoup/SoupGNOME-2.4.typelib
libsoup/tld_data.inc
libsoup/soup-version.h
libtool
-ltmain.sh
m4/gtk-doc.m4
m4/intltool.m4
m4/libtool.m4
m4/lt*.m4
-missing
-mkinstalldirs
po/*.gmo
po/libsoup.pot
po/Makefile.in.in
po/POTFILES
po/stamp-it
stamp-h1
-test-driver
tests/*.log
tests/*.trs
tests/*-test
tests/date
-tests/getbug
tests/header-parsing
tests/httpd.conf
tests/ntlm-test-helper
diff --git a/configure.ac b/configure.ac
index 92d52f83..a5461687 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,6 +10,7 @@ AC_PREREQ(2.63)
AC_INIT([libsoup],[soup_major_version.soup_minor_version.soup_micro_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=libsoup])
AC_CONFIG_SRCDIR([libsoup-2.4.pc.in])
AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz -Wno-portability])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)