Move lib8 to a separate folder

Author: danirod

configure.ac

@@ -24,5 +24,10 @@ PKG_CHECK_MODULES([CHECK], [check >= 0.9.6])
 
 # Output
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile])
+AC_CONFIG_FILES([
+    Makefile
+    src/Makefile
+    src/lib8/Makefile
+    tests/Makefile
+])
 AC_OUTPUT

src/Makefile.am

@@ -1,6 +1,4 @@
-noinst_LIBRARIES = lib8.a
-lib8_a_SOURCES = cpu.c cpu.h
-lib8_a_CFLAGS = -std=c99 -Wall
+SUBDIRS = lib8 .
 
 bin_PROGRAMS = chip8
 chip8_SOURCES = chip8.c libsdl.c libsdl.h

src/chip8.c

@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "cpu.h"
+#include "lib8/cpu.h"
 #include "libsdl.h"
-#include "../config.h"
+#include <config.h>
 
 #include <getopt.h>
 #include <stdio.h>

src/lib8/Makefile.am

@@ -0,0 +1,5 @@
+# This Makefile builds lib8.
+
+noinst_LIBRARIES = lib8.a
+lib8_a_SOURCES = cpu.c cpu.h
+lib8_a_CFLAGS = -std=c99 -Wall

src/cpu.c src/lib8/cpu.csrc/cpu.c renamed to src/lib8/cpu.c

@@ -19,7 +19,7 @@
 #ifndef LIBSDL_H_
 #define LIBSDL_H_
 
-#include "cpu.h"
+#include "lib8/cpu.h"
 
 #include <SDL.h>
 

src/cpu.h src/lib8/cpu.hsrc/cpu.h renamed to src/lib8/cpu.h

@@ -1,5 +1,5 @@
 TESTS = chip8_test
 check_PROGRAMS = chip8_test
 chip8_test_SOURCES = test.c opchip.c opschip.c screen.c
-chip8_test_CFLAGS = -std=c99 -Wall @CHECK_CFLAGS@
-chip8_test_LDADD = @CHECK_LIBS@ ../src/lib8.a
+chip8_test_CFLAGS = -std=c99 -Wall @CHECK_CFLAGS@ -I$(top_srcdir)/src
+chip8_test_LDADD = @CHECK_LIBS@ $(top_srcdir)/src/lib8/lib8.a

src/libsdl.h

@@ -23,7 +23,7 @@
 
 #include <check.h>
 #include <stdint.h>
-#include "../src/cpu.h"
+#include <lib8/cpu.h>
 
 struct machine_t cpu;
 

tests/Makefile.am

@@ -23,7 +23,7 @@
 
 #include <check.h>
 #include <stdint.h>
-#include "../src/cpu.h"
+#include <lib8/cpu.h>
 
 struct machine_t cpu;