Move autotools to the top level

Author: nomis52

.gitignore

@@ -19,44 +19,44 @@ ja-rule.X/nbproject/private/*
 .deps
 .dirstamp
 /googlemock-read-only/
-/tests/Makefile
-/tests/Makefile.in
-/tests/aclocal.m4
-/tests/autom4te.cache/
-/tests/build-stamp
-/tests/compile
-/tests/config.guess
-/tests/config.h
-/tests/config.h.in
-/tests/config.h.in~
-/tests/config.log
-/tests/config.status
-/tests/config.sub
-/tests/configure
-/tests/config/compile
-/tests/config/config.guess
-/tests/config/config.sub
-/tests/config/depcomp
-/tests/config/install-sh
-/tests/config/libtool.m4
-/tests/config/ltmain.sh
-/tests/config/ltoptions.m4
-/tests/config/ltsugar.m4
-/tests/config/ltversion.m4
-/tests/config/lt~obsolete.m4
-/tests/config/missing
-/tests/config/py-compile
-/tests/config/test-driver
-/tests/depcomp
+Makefile
+Makefile.in
+/aclocal.m4
+/autom4te.cache/
+/build-stamp
+/compile
+/config.guess
+/config.h
+/config.h.in
+/config.h.in~
+/config.log
+/config.status
+/config.sub
+/configure
+/config/compile
+/config/config.guess
+/config/config.sub
+/config/depcomp
+/config/install-sh
+/config/libtool.m4
+/config/ltmain.sh
+/config/ltoptions.m4
+/config/ltsugar.m4
+/config/ltversion.m4
+/config/lt~obsolete.m4
+/config/missing
+/config/py-compile
+/config/test-driver
+/depcomp
 /tests/doxygen_entrydb_*.tmp
 /tests/doxygen_objdb_*.tmp
 /tests/html/
-/tests/install-sh
-/tests/libtool
-/tests/ltmain.sh
-/tests/missing
-/tests/stamp-h1
-/tests/test-driver
+/install-sh
+/libtool
+/ltmain.sh
+/missing
+/stamp-h1
+/test-driver
 /tests/tests/.libs/
 /tests/tests/*_test
 /firmware/ja-rule.X/build/mx_795_512l/
@@ -77,4 +77,4 @@ ja-rule.X/nbproject/private/*
 /Bootloader/firmware/Bootloader.X/build/ethernet_sk2/
 /Bootloader/firmware/Bootloader.X/dist/ethernet_sk2/
 /Bootloader/firmware/Bootloader.X/build/number8/
-/Bootloader/firmware/Bootloader.X/dist/number8/
+/Bootloader/firmware/Bootloader.X/dist/number8/

.travis-ci.sh

@@ -50,7 +50,6 @@ elif [[ $TASK = 'check-licences' ]]; then
   fi;
 elif [[ $TASK = 'doxygen' ]]; then
   # check doxygen only if it is the requested task
-  cd tests
   autoreconf -i && ./configure --without-ola
   # the following is a bit of a hack to build the files normally built during
   # the build, so they are present for Doxygen to run against
@@ -67,7 +66,6 @@ elif [[ $TASK = 'doxygen' ]]; then
   fi;
 elif [[ $TASK = 'coverage' ]]; then
   # Compile with coverage for coveralls
-  cd tests
   autoreconf -i && ./configure --enable-gcov && make && make check
 elif [[ $TASK = 'coverity' ]]; then
   # Run Coverity Scan unless token is zero length
@@ -80,6 +78,5 @@ elif [[ $TASK = 'coverity' ]]; then
   fi;
 else
   # Otherwise compile and check as normal
-  cd tests
   autoreconf -i && ./configure && make check
 fi

Bootloader/firmware/src/Makefile.mk

@@ -0,0 +1,5 @@
+noinst_LTLIBRARIES += Bootloader/firmware/src/libbootloader.la
+
+Bootloader_firmware_src_libbootloader_la_SOURCES = \
+    Bootloader/firmware/src/bootloader.c
+Bootloader_firmware_src_libbootloader_la_CFLAGS = $(BUILD_FLAGS)

tests/Doxyfile Doxyfile

@@ -655,10 +655,10 @@ WARN_LOGFILE           =
 
 # The order of the .md files controls the order of the pages in the output.
 
-INPUT                  = ../Bootloader/firmware/src \
-                         ../boardcfg/template \
-                         ../common \
-                         ../firmware/src \
+INPUT                  = Bootloader/firmware/src \
+                         boardcfg/template \
+                         common \
+                         firmware/src \
                          doxygen/main.md \
                          doxygen/bootloader.md \
                          doxygen/memory.md \

Makefile.am

@@ -0,0 +1,37 @@
+
+# As suggested by libtoolize
+ACLOCAL_AMFLAGS = -I config
+
+include aminclude.am
+
+AM_CFLAGS = -Wall -Werror
+
+WARNING_CFLAGS = -Wall -Wformat -W -Werror
+WARNING_CXXFLAGS = -fvisibility-inlines-hidden
+
+# Code Under Test
+##################################################
+
+BUILD_FLAGS = -I boardcfg \
+              -I tests/system_config \
+              -I tests/harmony/include \
+              -I firmware/src \
+              -I common \
+              -I Bootloader/firmware/src \
+              $(WARNING_CFLAGS)
+
+noinst_PROGRAMS =
+
+noinst_LTLIBRARIES =
+
+TESTS =
+
+###################
+
+include Bootloader/firmware/src/Makefile.mk
+include firmware/src/Makefile.mk
+include tests/Makefile.mk
+include tools/Makefile.mk
+
+check_PROGRAMS = $(TESTS)
+

README.md

@@ -56,7 +56,7 @@ https://code.google.com/p/googletest/wiki/FAQ for the reasons.
 The install-gmock.sh helper script will download and build gmock & gtest in the
 local directory.
 
-Once gmock has been built, change into the test/ directory run:
+Once gmock has been built, run:
 
 ```
 autoreconf -i

tests/aminclude.am aminclude.am

@@ -65,7 +65,7 @@ DX_INIT_DOXYGEN($PACKAGE_NAME, Doxyfile, [], 1.8.0)
 #####################################################
 AC_ARG_WITH([gmock],
   [AS_HELP_STRING([--with-gmock=PATH], [The location of a built gmock)])],
-  [], [with_gmock=../googlemock-read-only])
+  [], [with_gmock=./googlemock-read-only])
 
 GMOCK_INCLUDES="-isystem $with_gmock/include"
 GMOCK_LIBS="$with_gmock/lib/libgmock.la $with_gmock/lib/libgmock_main.la"

tests/config/ax_cxx_compile_stdcxx_11.m4 config/ax_cxx_compile_stdcxx_11.m4

@@ -0,0 +1,73 @@
+noinst_LTLIBRARIES += firmware/src/libcoarsetimer.la \
+                      firmware/src/libdimmermodel.la \
+                      firmware/src/libflags.la \
+                      firmware/src/libledmodel.la \
+                      firmware/src/libmessagehandler.la \
+                      firmware/src/libnetworkmodel.la \
+                      firmware/src/libproxymodel.la \
+                      firmware/src/librandom.la \
+                      firmware/src/librdmbuffer.la \
+                      firmware/src/librdmhandler.la \
+                      firmware/src/librdmresponder.la \
+                      firmware/src/librdmutil.la \
+                      firmware/src/libreceivercounters.la \
+                      firmware/src/libresponder.la \
+                      firmware/src/libspirgb.la \
+                      firmware/src/libstreamdecoder.la \
+                      firmware/src/libtransceiver.la \
+                      firmware/src/libusbtransport.la
+
+firmware_src_libcoarsetimer_la_SOURCES = firmware/src/coarse_timer.c
+firmware_src_libcoarsetimer_la_CFLAGS = $(BUILD_FLAGS)
+
+firmware_src_libdimmermodel_la_SOURCES = firmware/src/dimmer_model.c
+firmware_src_libdimmermodel_la_CFLAGS = $(BUILD_FLAGS)
+
+firmware_src_libflags_la_SOURCES = firmware/src/flags.c
+firmware_src_libflags_la_CFLAGS = $(BUILD_FLAGS)
+
+firmware_src_libledmodel_la_SOURCES = firmware/src/led_model.c
+firmware_src_libledmodel_la_CFLAGS = $(BUILD_FLAGS)
+
+firmware_src_libmessagehandler_la_SOURCES = firmware/src/message_handler.c
+firmware_src_libmessagehandler_la_CFLAGS = $(BUILD_FLAGS)
+
+firmware_src_libnetworkmodel_la_SOURCES = firmware/src/network_model.c
+firmware_src_libnetworkmodel_la_CFLAGS = $(BUILD_FLAGS)
+
+firmware_src_libproxymodel_la_SOURCES = firmware/src/proxy_model.c
+firmware_src_libproxymodel_la_CFLAGS = $(BUILD_FLAGS)
+
+firmware_src_librandom_la_SOURCES = firmware/src/random.c
+firmware_src_librandom_la_CFLAGS = $(BUILD_FLAGS)
+
+firmware_src_librdmbuffer_la_SOURCES = firmware/src/rdm_buffer.c
+firmware_src_librdmbuffer_la_CFLAGS = $(BUILD_FLAGS)
+
+firmware_src_librdmhandler_la_SOURCES = firmware/src/rdm_handler.c
+firmware_src_librdmhandler_la_CFLAGS = $(BUILD_FLAGS)
+
+firmware_src_librdmresponder_la_SOURCES = firmware/src/rdm_responder.c
+firmware_src_librdmresponder_la_CFLAGS = $(BUILD_FLAGS)
+
+firmware_src_librdmutil_la_SOURCES = firmware/src/rdm_util.c
+firmware_src_librdmutil_la_CFLAGS = $(BUILD_FLAGS)
+
+firmware_src_libreceivercounters_la_SOURCES = firmware/src/receiver_counters.c
+firmware_src_libreceivercounters_la_CFLAGS = $(BUILD_FLAGS)
+
+firmware_src_libresponder_la_SOURCES = firmware/src/responder.c
+firmware_src_libresponder_la_CFLAGS = $(BUILD_FLAGS)
+
+firmware_src_libspirgb_la_SOURCES = firmware/src/spi_rgb.c
+firmware_src_libspirgb_la_CFLAGS = $(BUILD_FLAGS)
+
+firmware_src_libstreamdecoder_la_SOURCES = firmware/src/stream_decoder.c
+firmware_src_libstreamdecoder_la_CFLAGS = $(BUILD_FLAGS)
+
+firmware_src_libtransceiver_la_SOURCES = firmware/src/transceiver.c
+firmware_src_libtransceiver_la_CFLAGS = $(BUILD_FLAGS)
+firmware_src_libtransceiver_la_LIBADD = firmware/src/librandom.la
+
+firmware_src_libusbtransport_la_SOURCES = firmware/src/usb_transport.c
+firmware_src_libusbtransport_la_CFLAGS = $(BUILD_FLAGS)

tests/config/ax_prog_doxygen.m4 config/ax_prog_doxygen.m4

@@ -0,0 +1,3 @@
+include tests/harmony/Makefile.mk
+include tests/mocks/Makefile.mk
+include tests/tests/Makefile.mk