Use make the way it was intended

3 files changed, 16 insertions, 24 deletions

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..65d7bc7
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,16 @@
+OBJECTS=extract_version_1 extract_version_2 extract_version_3 split_version_2 map_coords convert_coords
+BINARIES=$(addprefix bin/,$(OBJECTS))
+CFLAGS+=-Wextra -O3
+LDFLAGS+=-lz -lm
+VPATH=src/export
+
+.SUFFIXES: .c
+
+all: $(BINARIES)
+
+bin/% : %.c mystdlib.c
+        $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS)
+
+.PHONY: clean
+clean:
+        @rm -f $(BINARIES)
diff --git a/src/makecolumns.sh b/makecolumns.sh
index 0f9c5ba..0f9c5ba 100755
--- a/src/makecolumns.sh
+++ b/makecolumns.sh
diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644
index 6d40c6b..0000000
--- a/src/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-BINARIES=../bin/extract_version_1 ../bin/extract_version_2 ../bin/extract_version_3 ../bin/split_version_2 ../bin/map_coords ../bin/convert_coords
-binaries: $(BINARIES)
-CFLAGS+=-Wextra
-
-../bin/extract_version_3: export/extract_version_3.c export/mystdlib.c
-        @$(CC) $(CFLAGS) -O2 -o ../bin/extract_version_3 export/extract_version_3.c export/mystdlib.c -lz -I export
-
-../bin/extract_version_2: export/extract_version_2.c export/mystdlib.c
-        @$(CC) $(CFLAGS) -O3 -o ../bin/extract_version_2 export/extract_version_2.c export/mystdlib.c -I export
-
-../bin/extract_version_1: export/extract_version_1.c export/mystdlib.c
-        @$(CC) $(CFLAGS) -O3 -o ../bin/extract_version_1 export/extract_version_1.c export/mystdlib.c -I export
-
-../bin/split_version_2: export/split_version_2.c
-        @$(CC) $(CFLAGS) -O3 -o ../bin/split_version_2 export/split_version_2.c
-
-../bin/map_coords: export/map_coords.c export/mystdlib.c
-        @$(CC) $(CFLAGS) -O3 -o ../bin/map_coords export/map_coords.c export/mystdlib.c -I export
-
-../bin/convert_coords: export/convert_coords.c
-        @$(CC) $(CFLAGS) -O3 -o ../bin/convert_coords export/convert_coords.c -lm
-
-clean:
-        @rm -f $(BINARIES)