Remove mavlink directory in favour of a module

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "test/modules/dronekit-la-testdata"]
 	path = test/modules/dronekit-la-testdata
 	url = https://github.com/dronekit/dronekit-la-testdata
+[submodule "modules/mavlink"]
+	path = modules/mavlink
+	url = git://github.com/ArduPilot/mavlink

Makefile

@@ -7,6 +7,7 @@ VPATH = ./util ./ini ./ini/cpp
 INCS = -I./util -I./ini -I./ini/cpp
 INCS += -Ijsoncpp
 INCS += -I.  # for <DataFlash/DataFlash.h> in MsgHandler
+INCS += -Imodules # for e.g. mavlink
 
 WARNFLAGS= -Wall -Werror -Wextra -Wunused -Wredundant-decls -D_FORTIFY_SOURCE=2 -Wfloat-equal -fstack-protector -Wformat -Werror=format-security -Werror=pointer-arith -Wpedantic
 
@@ -93,6 +94,13 @@ IMAGETAGGER = imagetagger
 
 all: $(LOG_ANALYZER)
 
+modules/mavlink/c_library/protocol.h: modules/mavlink/message_definitions/v1.0/common.xml modules/mavlink/message_definitions/v1.0/ardupilotmega.xml
+	cd modules/mavlink && python pymavlink/tools/mavgen.py --lang=C --wire-protocol=1.0 --output=c_library message_definitions/v1.0/ardupilotmega.xml
+
+mavlink-headers: modules/mavlink/c_library/protocol.h
+
+$(OBJS): mavlink-headers
+
 $(DATAFLASH_LOGGER): $(OBJS) dataflash_logger_program.cpp
 	$(LINK.cpp) -o $(DATAFLASH_LOGGER) dataflash_logger_program.cpp $(OBJS) $(LIBS) $(DLIBS)
 
@@ -104,6 +112,7 @@ $(IMAGETAGGER): $(OBJS) imagetagger.cpp mh_imagetagger.cpp
 
 clean:
 	$(RM) *.o *~ $(DATAFLASH_LOGGER) $(LOG_ANALYZER) $(IMAGETAGGER) analyzer/*.o jsoncpp/jsoncpp.o
+	$(RM) -rf modules/mavlink/c_library
 
 test: clean all
 	./test/test.sh

dataflash_logger.cpp

@@ -9,7 +9,7 @@
 
 #include "la-log.h"
 #include "util.h"
-#include "../mavlink/c_library/common/mavlink.h"
+#include "mavlink/c_library/common/mavlink.h"
 
 void DataFlash_Logger::sighup_received()
 {