aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile10
-rw-r--r--src/bitmap.c (renamed from bitmap.c)0
-rw-r--r--src/bitmap.h (renamed from bitmap.h)0
-rw-r--r--src/character.c (renamed from character.c)0
-rw-r--r--src/character.h (renamed from character.h)0
-rw-r--r--src/color.c (renamed from color.c)0
-rw-r--r--src/color.h (renamed from color.h)0
-rw-r--r--src/m.c (renamed from m.c)0
-rw-r--r--src/m.h (renamed from m.h)0
-rw-r--r--src/main.c (renamed from main.c)0
10 files changed, 4 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index bbecb30..5ef4629 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,12 @@
CC = /usr/bin/gcc
CFLAGS = -Wall
LDFLAGS = -lm
+SOURCEDIR = src
OUTPUT = bitmap
BUILDDIR = build
FILE = 022.bmp
-SRCS = $(wildcard *.c)
+SRCS = $(wildcard $(SOURCEDIR)/*.c)
OBJ = $(SRCS:.c=.o)
build: $(OBJ)
@@ -19,11 +20,8 @@ gdb: debug
gdb $(BUILDDIR)/$(OUTPUT)
%.o: %.c
- @echo
- @echo Building $<
- @echo ==============
- @echo
- $(CC) $(CFLAGS) -c $<
+ @echo [ CC ] $<
+ @$(CC) $(CFLAGS) -c $< -o $@
all: clean build
diff --git a/bitmap.c b/src/bitmap.c
index bb88b46..bb88b46 100644
--- a/bitmap.c
+++ b/src/bitmap.c
diff --git a/bitmap.h b/src/bitmap.h
index d222ffb..d222ffb 100644
--- a/bitmap.h
+++ b/src/bitmap.h
diff --git a/character.c b/src/character.c
index 658f0be..658f0be 100644
--- a/character.c
+++ b/src/character.c
diff --git a/character.h b/src/character.h
index 7e17cd7..7e17cd7 100644
--- a/character.h
+++ b/src/character.h
diff --git a/color.c b/src/color.c
index d822d56..d822d56 100644
--- a/color.c
+++ b/src/color.c
diff --git a/color.h b/src/color.h
index 10d376e..10d376e 100644
--- a/color.h
+++ b/src/color.h
diff --git a/m.c b/src/m.c
index b1401f1..b1401f1 100644
--- a/m.c
+++ b/src/m.c
diff --git a/m.h b/src/m.h
index 25aff9e..25aff9e 100644
--- a/m.h
+++ b/src/m.h
diff --git a/main.c b/src/main.c
index b8bf074..b8bf074 100644
--- a/main.c
+++ b/src/main.c