Create a "system" module

Also unify makefiles, otherwise dependencies are not properly resolved.

1 files changed, 13 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index 0233c47..c20fb08 100644
--- a/Makefile
+++ b/Makefile
@@ -27,16 +27,19 @@ export __LIBS   := $(shell pkg-config --libs sqlite3)
 
 all: $(PROG)
 
-$(PROG):
-	make -C src
-	mv src/$(PROG) ./
-
+$(PROG): src/main.o src/system.o
+	$(CC) -o $@ $^ $(__LIBS) $(LDFLAGS) $(LIBS)
 # Create cache and config directories at compile time since they will be used by
 # the user who compiled ftag
 # TODO: create this directories from "ftag init"
 	mkdir -p $(FTAG_CACHE_DIR)
 	mkdir -p $(FTAG_CONFIG_DIR)
 
+src/main.o: src/main.c src/system.h
+src/system.o: src/system.c src/system.h
+.c.o:
+	$(CC) $(__CFLAGS) $(CFLAGS) -o $@ -c $<
+
 install: $(PROG)
 	mkdir -p $(PREFIX)/bin
 	install --mode=0755 $(PROG) $(PREFIX)/bin/
@@ -46,11 +49,13 @@ install: $(PROG)
 
 uninstall:
 	rm -f  $(PREFIX)/bin/$(PROG)
-	rm -rf $(PREFIX)/share/ftag
+	rm -rf $(PREFIX)/share/ftag $(FTAG_CACHE_DIR) $(FTAG_CONFIG_DIR)
 
 clean:
-	make -C src clean
-	rm -rf $(PROG) ftag-$(FTAG_VERSION) ftag-$(FTAG_VERSION)
+	rm -rf $(PROG) $(FTAG_ARCHIVE_DIR) $(FTAG_ARCHIVE) src/*.o
+
+fullclean: clean
+	rm -rf $(FTAG_CACHE_DIR) $(FTAG_CONFIG_DIR)
 
 dist:
 	mkdir -p $(FTAG_ARCHIVE_DIR) \
@@ -61,4 +66,4 @@ dist:
 	cp sql/init.sql $(FTAG_ARCHIVE_DIR)/sql/
 	tar -czf $(FTAG_ARCHIVE) $(FTAG_ARCHIVE_DIR)
 
-.PHONY: all clean dist install uninstall
+.PHONY: all clean dist fullclean install uninstall