Commit 22b88f68 authored by Julien Bonjean's avatar Julien Bonjean

[#2402] Improved code indent for daemon

parent 5fc29fa3
......@@ -12,4 +12,5 @@ indent-switches # Indent 'switch' blocks so that the 'case X:' statement
break-blocks # Pad empty lines around header blocks (e.g. 'if', 'while'...).
brackets=linux
unpad=paren
formatted
-d
......@@ -24,13 +24,6 @@ doc:
@echo "D-Bus API HTML documentation has been generated in doc/dbus-api/doc/spec"
@echo ""
indent:
@echo "Indenting code:"
if [ -f $(ASTYLERC) ] ; then \
$(indent) --options=$(ASTYLERC) --recursive *.cpp *.h; \
fi
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = libs src ringtones man $(TESTS_DIR)
EXTRA_DIST = m4/*.m4 tools/*.sh platform/* images/* README.gentoo
......
......@@ -7,7 +7,7 @@ sfllibdir=$(DESTDIR)$(libdir)/sflphone
sflcodecdir=$(sfllibdir)/codecs
sflplugindir=$(sfllibdir)/plugins
ASTYLERC="../astylerc"
ASTYLERC="$(top_srcdir)/../astylerc"
indent="/usr/bin/astyle"
# for pjsip
......@@ -69,3 +69,10 @@ AM_CPPFLAGS = \
-DENABLE_TRACE \
$(SPEEXCODEC) \
$(GSMCODEC)
indent:
@echo "Indenting code:"
if [ -f $(ASTYLERC) ] ; then \
find $(top_srcdir)/src/ -regex ".*\.\(h\|cpp\)" -exec $(indent) --options=$(ASTYLERC) {} \; ; \
fi
......@@ -102,9 +102,4 @@ libsflphone_la_CFLAGS = \
libsflphone_la_SOURCES =
indent:
@echo "Indenting code:"
if [ -f $(ASTYLERC) ] ; then \
$(indent) --options=$(ASTYLERC) --recursive *.cpp *.h; \
fi
all: indent
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment