Restructure project, make names more clear

1 files changed, 13 insertions, 12 deletions

diff --git a/src/Makefile b/src/Makefile
index 1a09455..21370a6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,19 +1,20 @@
-all: decompress extractblocks mapcoords convertcoords splitold
+BINARIES=../bin/extract_version_2 ../bin/extract_version_3 ../bin/split_version_2 ../bin/map_coords ../bin/convert_coords
+binaries: $(BINARIES)
 
-decompress: decompress.c mystdlib.c
-        @$(CC) -O2 -o ../bin/decompress decompress.c mystdlib.c -lz
+../bin/extract_version_3: export/extract_version_3.c export/mystdlib.c
+        @$(CC) -O2 -o ../bin/extract_version_3 export/extract_version_3.c export/mystdlib.c -lz -I export
 
-extractblocks: extractblocks_new.c mystdlib.c
-        @$(CC) -o ../bin/extractblocks extractblocks_new.c mystdlib.c
+../bin/extract_version_2: export/extract_version_2.c export/mystdlib.c
+        @$(CC) -O2 -o ../bin/extract_version_2 export/extract_version_2.c export/mystdlib.c -I export
 
-mapcoords: mapcoords.c mystdlib.c
-        @$(CC) -o ../bin/mapcoords mapcoords.c mystdlib.c
+../bin/split_version_2: export/split_version_2.c export/mystdlib.c
+        @$(CC) -o ../bin/split_version_2 export/split_version_2.c export/mystdlib.c -I export
 
-splitold: splitold.c mystdlib.c
-        @$(CC) -o ../bin/splitold splitold.c mystdlib.c
+../bin/map_coords: export/map_coords.c export/mystdlib.c
+        @$(CC) -o ../bin/map_coords export/map_coords.c export/mystdlib.c -I export
 
-convertcoords: convertcoords.c
-        @$(CC) -o ../bin/convertcoords convertcoords.c -lm
+../bin/convert_coords: export/convert_coords.c
+        @$(CC) -o ../bin/convert_coords export/convert_coords.c -lm
 
 clean:
-        @rm -f ../bin/{decompress,extractblocks,mapcoords,convertcoords,splitold}
+        @rm -f $(BINARIES)