diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | telepathy-glib/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/Makefile.am | 4 | ||||
| -rw-r--r-- | tools/check-c-style.sh (renamed from check-c-style.sh) | 2 | ||||
| -rw-r--r-- | tools/check-coding-style.mk (renamed from check-coding-style.mk) | 6 | ||||
| -rw-r--r-- | tools/check-misc.sh (renamed from check-misc.sh) | 2 | ||||
| -rw-r--r-- | tools/check-whitespace.sh (renamed from check-whitespace.sh) | 0 |
8 files changed, 12 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index a72b04fcf..e1bf388c1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,10 +9,6 @@ pkgconfig_DATA = telepathy-glib.pc telepathy-glib-unstable.pc EXTRA_DIST = \ autogen.sh \ - check-coding-style.mk \ - check-c-style.sh \ - check-misc.sh \ - check-whitespace.sh \ gtk-doc.make CLEANFILES = FIXME.out diff --git a/telepathy-glib/Makefile.am b/telepathy-glib/Makefile.am index bfb7a580d..cdaab7ff6 100644 --- a/telepathy-glib/Makefile.am +++ b/telepathy-glib/Makefile.am @@ -113,7 +113,7 @@ CLEANFILES = \ check_c_sources = \ $(tpginclude_HEADERS) \ $(libtelepathy_glib_la_SOURCES) -include $(top_srcdir)/check-coding-style.mk +include $(top_srcdir)/tools/check-coding-style.mk libtelepathy_glib_internal_la_SOURCES = \ base-connection.c \ diff --git a/tests/Makefile.am b/tests/Makefile.am index a24cf1053..7aba28f54 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -35,7 +35,7 @@ test_internal_debug_LDADD = \ ../telepathy-glib/libtelepathy-glib-internal.la check_c_sources = *.c -include $(top_srcdir)/check-coding-style.mk +include $(top_srcdir)/tools/check-coding-style.mk AM_CFLAGS = $(ERROR_CFLAGS) @DBUS_CFLAGS@ @GLIB_CFLAGS@ @COVERAGE_CFLAGS@ -I.. -I$(srcdir)/.. AM_LDFLAGS = @DBUS_LIBS@ @GLIB_LIBS@ diff --git a/tools/Makefile.am b/tools/Makefile.am index 23358f6fd..157240334 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,5 +1,9 @@ EXTRA_DIST = \ c-constants-generator.xsl \ + check-coding-style.mk \ + check-c-style.sh \ + check-misc.sh \ + check-whitespace.sh \ c-interfaces-generator.xsl \ genginterface.py \ glib-errors-enum-body.xsl \ diff --git a/check-c-style.sh b/tools/check-c-style.sh index 6483141ac..357fdb365 100644 --- a/check-c-style.sh +++ b/tools/check-c-style.sh @@ -1,7 +1,7 @@ #!/bin/sh fail=0 -( . "${top_srcdir}"/check-misc.sh ) || fail=$? +( . "${tools_dir}"/check-misc.sh ) || fail=$? if grep -n '^ *GError *\*[[:alpha:]_][[:alnum:]_]* *;' "$@" then diff --git a/check-coding-style.mk b/tools/check-coding-style.mk index ef6ff1735..1499f2f05 100644 --- a/check-coding-style.mk +++ b/tools/check-coding-style.mk @@ -1,11 +1,13 @@ check-local:: @fail=0; \ if test -n "$(check_misc_sources)"; then \ - top_srcdir=$(top_srcdir) sh $(top_srcdir)/check-misc.sh \ + tools_dir=$(top_srcdir)/tools \ + sh $(top_srcdir)/tools/check-misc.sh \ $(check_misc_sources) || fail=1; \ fi; \ if test -n "$(check_c_sources)"; then \ - top_srcdir=$(top_srcdir) sh $(top_srcdir)/check-c-style.sh \ + tools_dir=$(top_srcdir)/tools \ + sh $(top_srcdir)/tools/check-c-style.sh \ $(check_c_sources) || fail=1; \ fi;\ if test yes = "$(ENABLE_CODING_STYLE_CHECKS)"; then \ diff --git a/check-misc.sh b/tools/check-misc.sh index 56bfc2726..89e8e871a 100644 --- a/check-misc.sh +++ b/tools/check-misc.sh @@ -2,7 +2,7 @@ fail=0 -( . "${top_srcdir}"/check-whitespace.sh ) || fail=$? +( . "${tools_dir}"/check-whitespace.sh ) || fail=$? if egrep '(Free\s*Software\s*Foundation.*02139|02111-1307)' "$@" then diff --git a/check-whitespace.sh b/tools/check-whitespace.sh index 534833126..534833126 100644 --- a/check-whitespace.sh +++ b/tools/check-whitespace.sh |