Organize source code and tests

16 files changed, 10 insertions, 11 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7dd8b7..13c67a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,10 +23,10 @@ set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} ${common_flags}")
 set(CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} ${common_debug_flags}")
 
 set(m68kdisasm_sources
-    main.cpp
-    data_buffer.cpp
-    disasm.cpp
-    elf_image.cpp
+    src/main.cpp
+    src/data_buffer.cpp
+    src/disasm.cpp
+    src/elf_image.cpp
     )
 
 add_executable(m68k-disasm ${m68kdisasm_sources})
diff --git a/Makefile b/Makefile
index 2b6ee2f..245bf54 100644
--- a/Makefile
+++ b/Makefile
@@ -22,12 +22,11 @@ m68k-disasm: $(OBJECTS) $(LDSCRIPTS) Makefile
 
 $(OBJECTS): Makefile
 
-%.o: %.c Makefile
+%.o: src/%.c Makefile
 	sh -c "time $(CC) $(_CFLAGS) -c -o $@ $<"
 
-%.o: %.cpp Makefile
+%.o: src/%.cpp Makefile
 	sh -c "time $(CXX) $(_CXXFLAGS) -c -o $@ $<"
 
 clean:
 	rm -rfv m68k-disasm $(OBJECTS)
-
diff --git a/common.h b/src/common.h
index 76fc956..76fc956 100644
--- a/common.h
+++ b/src/common.h
diff --git a/data_buffer.cpp b/src/data_buffer.cpp
index 33cb0b3..33cb0b3 100644
--- a/data_buffer.cpp
+++ b/src/data_buffer.cpp
diff --git a/data_buffer.h b/src/data_buffer.h
index bc264d2..bc264d2 100644
--- a/data_buffer.h
+++ b/src/data_buffer.h
diff --git a/disasm.cpp b/src/disasm.cpp
index 2b2ea81..2b2ea81 100644
--- a/disasm.cpp
+++ b/src/disasm.cpp
diff --git a/disasm.h b/src/disasm.h
index 65429dc..65429dc 100644
--- a/disasm.h
+++ b/src/disasm.h
diff --git a/elf_format.h b/src/elf_format.h
index b5a268a..b5a268a 100644
--- a/elf_format.h
+++ b/src/elf_format.h
diff --git a/elf_image.cpp b/src/elf_image.cpp
index 6db72f3..6db72f3 100644
--- a/elf_image.cpp
+++ b/src/elf_image.cpp
diff --git a/elf_image.h b/src/elf_image.h
index b7c7123..b7c7123 100644
--- a/elf_image.h
+++ b/src/elf_image.h
diff --git a/main.cpp b/src/main.cpp
index a6f73b3..a6f73b3 100644
--- a/main.cpp
+++ b/src/main.cpp
diff --git a/test.bash b/tests/test.bash
index 3289473..6025908 100644
--- a/test.bash
+++ b/tests/test.bash
@@ -7,7 +7,7 @@
 AS=m68k-none-elf-as
 OBJCOPY=m68k-none-elf-objcopy
 LD="m68k-none-elf-ld -Ttest.ld"
-DISASM="./cmake-build/m68k-disasm -fabs-labels -frel-labels -flabels -fimm-hex -ffollow-jumps"
+DISASM="../cmake-build/m68k-disasm -fabs-labels -frel-labels -flabels -fimm-hex -ffollow-jumps"
 TEST_DIR=/tmp/m68k-disasm-tests
 
 set -e
diff --git a/test.ld b/tests/test.ld
index f939414..f939414 100644
--- a/test.ld
+++ b/tests/test.ld
diff --git a/test_labels_referencing.bash b/tests/test_labels_referencing.bash
index 978dbc7..8b5df40 100644
--- a/test_labels_referencing.bash
+++ b/tests/test_labels_referencing.bash
@@ -7,7 +7,7 @@
 AS=m68k-none-elf-as
 OBJCOPY=m68k-none-elf-objcopy
 LD="m68k-none-elf-ld -Ttest.ld"
-DISASM="./cmake-build/m68k-disasm -ffollow-jumps"
+DISASM="../cmake-build/m68k-disasm -ffollow-jumps"
 TEST_DIR=/tmp/m68k-disasm-tests-labels-referencing
 
 set -e
diff --git a/test_random.bash b/tests/test_random.bash
index 6d2b17c..3c7a0d2 100644
--- a/test_random.bash
+++ b/tests/test_random.bash
@@ -7,7 +7,7 @@
 AS=m68k-none-elf-as
 OBJCOPY=m68k-none-elf-objcopy
 LD="m68k-none-elf-ld -Ttest.ld"
-DISASM="./cmake-build/m68k-disasm -frdc -fxrefs-to -fxrefs-from -flabels -frel-labels -fabs-labels -fshort-ref-local-labels -fimm-hex -ffollow-jumps"
+DISASM="../cmake-build/m68k-disasm -frdc -fxrefs-to -fxrefs-from -flabels -frel-labels -fabs-labels -fshort-ref-local-labels -fimm-hex -ffollow-jumps"
 TEST_DIR=/tmp/m68k-disasm-random-tests
 
 set -e
diff --git a/test_walk_and_follow_jumps.bash b/tests/test_walk_and_follow_jumps.bash
index 2f317b4..0f11e09 100644
--- a/test_walk_and_follow_jumps.bash
+++ b/tests/test_walk_and_follow_jumps.bash
@@ -5,7 +5,7 @@
 # Tests against reference text for -ffollow-jumps and -fwalk features
 
 TEST_DIR=/tmp/m68k-disasm-follow-jumps-walk-tests
-DISASM="./cmake-build/m68k-disasm -flabels -frel-labels -fabs-labels"
+DISASM="../cmake-build/m68k-disasm -flabels -frel-labels -fabs-labels"
 
 set -e
 CRED="\033[31m"