Rework makefile, made .inc into .inc.h.

4 files changed, 22 insertions, 20 deletions

diff --git a/Makefile b/Makefile
index 12045831..041f0432 100644
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,42 @@
 .PHONY: all clean
 
 CC  := gcc
-LEX := flex
 
-DIRS := obj
+OBJDIR = obj
 
-CFLAGS  = -std=gnu99 -Wall -Wextra -pedantic \
-		  -DSAFE_STR -DSAFE_HASH -ggdb \
-		  -fPIC \
+CPPFLAGS = -DSAFE_STR -DSAFE_HASH 
+CFLAGS  = $(CPPFLAGS) \
+		  -std=gnu99 -Wall -Wextra -pedantic \
+		  -ggdb -fPIC \
 		  $(shell guile-config compile)
-# LFLAGS  =
 LDFLAGS = -fPIC $(shell guile-config link)
 
-C_FILES = $(wildcard *.c)
-INC_FILES = $(wildcard *.inc)
-O_FILES = $(addprefix obj/,$(C_FILES:.c=.o))
 H_FILES = $(wildcard *.h)
 
-$(shell mkdir -p $(DIRS))
+C_FILES = $(wildcard *.c)
 
 all: parse libguile-calendar.so
 
-obj/%.o : %.c $(H_FILES) $(INC_FILES)
-	$(CC) -c -o $@ $< ${CFLAGS}
+O_FILES = $(addprefix obj/,$(C_FILES:.c=.o))
 
-libguile-calendar.so: $(O_FILES)
-	$(CC) -shared -o $@ $^ $(LDFLAGS)
+all: parse libguile-calendar.so
 
 parse: $(O_FILES)
 	$(CC) -o $@ $^ $(LDFLAGS)
 
+$(O_FILES): | $(OBJDIR)
+
+$(OBJDIR)/%.o : %.c $(H_FILES)
+	$(CC) -c -o $@ $< $(CFLAGS)
+
+$(OBJDIR):
+	mkdir -p $(OBJDIR)
+
+libguile-calendar.so: $(O_FILES)
+	$(CC) -shared -o $@ $^ $(LDFLAGS)
+
 clean:
 	-rm parse
-	-rm obj/*.o
+	-rm $(OBJDIR)/*.o
+	-rmdir $(OBJDIR)
 	-rm *.so
diff --git a/hash.inc b/hash.inc.h
index 81da6218..0b07629f 100644
--- a/hash.inc
+++ b/hash.inc.h
@@ -59,5 +59,3 @@ int HASH_FREE(TYPE) ( TABLE(TYPE)* table ) {
 }
 
 #endif /* TYPE */
-
-// vim: ft=c
diff --git a/trie.inc b/trie.inc.h
index 532251b3..50aeff29 100644
--- a/trie.inc
+++ b/trie.inc.h
@@ -111,5 +111,3 @@ int TRIE_FREE(TYPE) ( TRIE(TYPE)* trie ) {
 }
 
 #endif /* TYPE */
-
-// vim: ft=c
diff --git a/vcal.c b/vcal.c
index 65caaa26..2310c3fb 100644
--- a/vcal.c
+++ b/vcal.c
@@ -4,7 +4,7 @@
 
 #define TYPE content_line
 // #include "hash.inc"
-#include "trie.inc"
+#include "trie.inc.h"
 #undef TYPE
 
 int CONSTRUCTOR_DECL(vevent) {