Merge branch 'chores/files-separation' into develop

1 files changed, 11 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 095024d..89cbf0c 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,8 @@ DATADIR = $(PREFIX)/share/badwolf
 PACKAGE = Badwolf
 
 DEPS  = gtk+-3.0 webkit2gtk-4.0
-OBJS  = badwolf
+OBJS  = keybindings.o
+EXE   = badwolf
 TRANS = fr.mo
 
 CC     = cc
@@ -15,7 +16,7 @@ CFLAGS = -g -Wall -Wextra -Wconversion -Wsign-conversion
 CDEPS  = `pkg-config --cflags $(DEPS)` -DDATADIR=\"$(DATADIR)\" -DPACKAGE=\"$(PACKAGE)\" -D_DEFAULT_SOURCE
 LIBS   = `pkg-config --libs $(DEPS)`
 
-all: $(OBJS) $(TRANS)
+all: $(EXE) $(TRANS)
 
 po/messages.pot: badwolf.c
 	xgettext --keyword=_ --language=C -o $@ --add-comments --sort-output -j badwolf.c
@@ -27,8 +28,14 @@ ${TRANS}: po/${@:.mo=.po}
 	mkdir -p locale/${@:.mo=}/LC_MESSAGES
 	msgfmt -o locale/${@:.mo=}/LC_MESSAGES/$(PACKAGE).mo po/${@:.mo=.po}
 
+${EXE}: $(OBJS)
+	$(CC) -std=c11 $(CFLAGS) $(CDEPS) $(LDFLAGS) $(LIBS) -o $@ $(OBJS) $@.c
+
 .c:
-	$(CC) -std=c11 $(CFLAGS) $(CDEPS) -o $@ $< $(LDFLAGS) $(LIBS)
+	$(CC) -std=c11 $(CFLAGS) $(CDEPS) $(LDFLAGS) $(LIBS) -o $@ $<
+
+.c.o:
+	$(CC) -std=c11 $(CFLAGS) $(CDEPS) $(LDFLAGS) $(LIBS) -c -o $@ $<
 
 install: all
 	mkdir -p $(DESTDIR)$(BINDIR)
@@ -39,7 +46,7 @@ install: all
 	cp -r locale/ $(DESTDIR)$(DATADIR)
 
 clean:
-	rm -fr locale $(OBJS)
+	rm -fr locale $(OBJS) $(EXE)
 
 format: *.c *.h
 	clang-format -style=file -assume-filename=.clang-format -i *.c *.h