working commit

Makefile.in

@@ -217,6 +217,7 @@ distcleancheck_listfiles = \
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+ASTYLE = @ASTYLE@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -334,6 +335,7 @@ udpclient_test_SOURCES = \
 	udpclient.cpp udpclient.hpp \
 	udpclient_test.cpp
 
+ASTYLE_OPTS = --indent=spaces=8 --style=java
 all: defines.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -835,11 +837,14 @@ run: helmetd
 
 hello.pb.cc hello.pb.h: hello.proto
 	$(PROTOC) --cpp_out=. hello.proto
+format:
+	$(ASTYLE) $(ASTYLE_OPTS) *.hpp *.cpp
 
 clean-local:
 	rm -rf autom4te.cache
 	rm -f *~
 	rm -f *.o
+	rm -f *.orig
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.