From e9d8b1aca776341c9cdaa2ea6406336661d82a76 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Wed, 19 Jun 2013 05:22:21 +0200 Subject: [PATCH] Restructured source tree. Code moves to src/, object files to build/. --- Makefile | 14 +++++++++----- draw_wins.c => src/draw_wins.c | 0 draw_wins.h => src/draw_wins.h | 0 keybindings.c => src/keybindings.c | 0 keybindings.h => src/keybindings.h | 0 readwrite.c => src/readwrite.c | 0 readwrite.h => src/readwrite.h | 0 roguelike.c => src/roguelike.c | 0 roguelike.h => src/roguelike.h | 0 windows.c => src/windows.c | 0 windows.h => src/windows.h | 0 11 files changed, 9 insertions(+), 5 deletions(-) rename draw_wins.c => src/draw_wins.c (100%) rename draw_wins.h => src/draw_wins.h (100%) rename keybindings.c => src/keybindings.c (100%) rename keybindings.h => src/keybindings.h (100%) rename readwrite.c => src/readwrite.c (100%) rename readwrite.h => src/readwrite.h (100%) rename roguelike.c => src/roguelike.c (100%) rename roguelike.h => src/roguelike.h (100%) rename windows.c => src/windows.c (100%) rename windows.h => src/windows.h (100%) diff --git a/Makefile b/Makefile index bedecc0..69eb0a9 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,19 @@ CC=cc CFLAGS=-Wall -g TARGET=roguelike -SOURCES=$(shell find . -type f -name \*.c) -OBJECTS=$(SOURCES:.c=.o) +SRCDIR=src +BUILDDIR=build +SOURCES=$(shell find $(SRCDIR)/ -type f -name \*.c) +OBJECTS=$(patsubst $(SRCDIR)/%,$(BUILDDIR)/%,$(SOURCES:.c=.o)) roguelike: $(OBJECTS) $(CC) $(CFLAGS) -o roguelike $(OBJECTS) -lncurses -%.o: %.c - $(CC) $(CFLAGS) -c $< -o $@ +$(BUILDDIR)/%.o: $(SRCDIR)/%.c + mkdir -p $(BUILDDIR); $(CC) $(CFLAGS) -c $< -o $@ .PHONY: clean clean: - rm $(OBJECTS); rm roguelike + rm $(OBJECTS) + rmdir $(BUILDDIR) + rm $(TARGET) diff --git a/draw_wins.c b/src/draw_wins.c similarity index 100% rename from draw_wins.c rename to src/draw_wins.c diff --git a/draw_wins.h b/src/draw_wins.h similarity index 100% rename from draw_wins.h rename to src/draw_wins.h diff --git a/keybindings.c b/src/keybindings.c similarity index 100% rename from keybindings.c rename to src/keybindings.c diff --git a/keybindings.h b/src/keybindings.h similarity index 100% rename from keybindings.h rename to src/keybindings.h diff --git a/readwrite.c b/src/readwrite.c similarity index 100% rename from readwrite.c rename to src/readwrite.c diff --git a/readwrite.h b/src/readwrite.h similarity index 100% rename from readwrite.h rename to src/readwrite.h diff --git a/roguelike.c b/src/roguelike.c similarity index 100% rename from roguelike.c rename to src/roguelike.c diff --git a/roguelike.h b/src/roguelike.h similarity index 100% rename from roguelike.h rename to src/roguelike.h diff --git a/windows.c b/src/windows.c similarity index 100% rename from windows.c rename to src/windows.c diff --git a/windows.h b/src/windows.h similarity index 100% rename from windows.h rename to src/windows.h -- 2.30.2