Update login flow and timeline window

1 files changed, 43 insertions, 26 deletions

diff --git a/Makefile b/Makefile
index 0134d5e..781f0aa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,34 @@
-CC=cc
-PKGCONFIG=$(shell which pkg-config)
-
-CFLAGS=-o2 -pipe
-CFLAGS+=-Wall -Wextra -Wno-unused-parameter -std=c99
-CFLAGS+=$(shell $(PKGCONFIG) --cflags gtk+-3.0 libcurl jansson) -lpthread
-LDFLAGS+=$(shell $(PKGCONFIG) --libs gtk+-3.0 libcurl jansson) -lpthread
+.POSIX:
+CC=c99
+CFLAGS=-Wall -Wextra -Wno-unused-parameter
+E_CGLAGS=$$(pkg-config --cflags gtk+-3.0 jansson libcurl) $(CFLAGS)
+LDFLAGS=
+E_LDFLAGS=$$(pkg-config --libs gtk+-3.0 jansson libcurl) $(LDFLAGS)
 DESTDIR=
 PREFIX=/usr/local
 BINDIR=$(PREFIX)/bin
 
-OUTDIR=build
-OBJECTS=$(OUTDIR)/main.o \
-		$(OUTDIR)/string-util.o \
-		$(OUTDIR)/instance_info.o \
-		$(OUTDIR)/http.o \
-		$(OUTDIR)/status.o \
-		$(OUTDIR)/timeline.o \
-		$(OUTDIR)/auth.o \
-		$(OUTDIR)/register.o \
-		$(OUTDIR)/login_window.o \
-		$(OUTDIR)/timeline_window.o \
-		$(OUTDIR)/config.o \
-		$(OUTDIR)/log.o
+OBJECTS=src/main.o \
+	src/string-util.o \
+	src/instance_info.o \
+	src/http.o \
+	src/status.o \
+	src/account.o \
+	src/timeline.o \
+	src/auth.o \
+	src/register.o \
+	src/login_window.o \
+	src/main_window.o \
+	src/config.o \
+	src/log.o
 
 all: ap_client
 
 ap_client: $(OBJECTS)
-	$(CC) $(LDFLAGS) -o ap_client $(OBJECTS)
+	$(CC) $(E_LDFLAGS) -o ap_client $(OBJECTS)
 
-$(OUTDIR)/%.o: src/%.c src/*.h
-	@mkdir -p $(OUTDIR)
-	$(CC) $(CFLAGS) -c -o $@ $<
+.c.o:
+	$(CC) $(E_CGLAGS) -c -o $@ $<
 
 install: ap_client
 	mkdir -p $(DESTDIR)$(BINDIR)
@@ -39,9 +37,28 @@ install: ap_client
 
 clean:
 	rm -f ap_client
-	rm -rf $(OUTDIR)
+	rm -rf src/*.o
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/ap_client
 
-.PHONY: all clean install uninstall
+src/account.o: src/account.c src/account.h src/log.h
+src/auth.o: src/auth.c src/string-util.h src/auth.h src/http.h \
+	src/config.h src/log.h
+src/config.o: src/config.c src/string-util.h src/config.h src/log.h
+src/http.o: src/http.c src/string-util.h src/auth.h src/config.h \
+ 	src/log.h
+src/instance_info.o: src/instance_info.c src/instance_info.h src/log.h
+src/log.o: src/log.c src/log.h
+src/login_window.o: src/login_window.c src/auth.h src/register.h \
+	src/http.h src/timeline.h src/status.h src/account.h src/main_window.h \
+	src/log.h
+src/main.o: src/main.c src/http.h src/config.h src/main_window.h
+src/main_window.o: src/main_window.c src/auth.h src/http.h src/timeline.h \
+	src/status.h src/account.h src/log.h src/config.h src/login_window.h \
+	src/string-util.h
+src/register.o: src/register.c src/http.h src/config.h src/log.h
+src/status.o: src/status.c src/status.h src/account.h src/log.h
+src/string-util.o: src/string-util.c
+src/timeline.o: src/timeline.c src/timeline.h src/status.h src/account.h \
+	src/auth.h src/config.h src/http.h src/string-util.h src/log.h