From 8ee74d84e35bc6b8c6874646e52f11b81f6858bf Mon Sep 17 00:00:00 2001 From: g1n Date: Tue, 28 Jun 2022 17:47:58 +0300 Subject: [PATCH] Restructured repository and rewrote Makefile --- .gitignore | 2 ++ src/.gitignore | 4 ---- src/Makefile | 31 ++++++++++++++++++------------- 3 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 .gitignore delete mode 100644 src/.gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bdc5af0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*~ +build diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index f9ddb8c..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -* -!.gitignore -!*.c -!Makefile diff --git a/src/Makefile b/src/Makefile index 3b10f48..761e381 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,17 +1,22 @@ -CC= gcc -SRCFILES= cat.c touch.c yes.c mkdir.c echo.c ls.c -OBJFILES= cat touch yes mkdir echo ls -CFLAGS= -Wall -Wextra +CC=cc +BUILDDIR=../build +TESTSDIR=../tests -.PHONY: all clean +CFLAGS=-Wall -Wextra -all: - $(CC) $(CFLAGS) cat.c -o cat - $(CC) $(CFLAGS) touch.c -o touch - $(CC) $(CFLAGS) yes.c -o yes - $(CC) $(CFLAGS) mkdir.c -o mkdir - $(CC) $(CFLAGS) echo.c -o echo - $(CC) $(CFLAGS) ls.c -o ls +CFILES=$(wildcard *.c) +OFILES=$(patsubst %.c, $(BUILDDIR)/%.o, $(CFILES)) + +.PHONY: all clean test +.SUFFIXES: .o .c + +all: $(BUILDDIR) $(OFILES) + +$(BUILDDIR): + mkdir -p $(BUILDDIR) + +$(BUILDDIR)/%.o: %.c + $(CC) $(CFLAGS) $< -o $@ clean: - @rm ${OBJFILES} + rm -rf $(BUILDDIR)