From 2828da83db7bbba6b66234614c34aedf9a9eb284 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Fri, 15 Mar 2019 18:11:39 +0100
Subject: Makefile: fix clang-format path

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 17e7b2c..f254fcf 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,6 @@ clean:
 	rm badwolf
 
 format: *.c *.h
-	clang-format -style=file -assume-filename=~/.clang-format -i *.c *.h
+	clang-format -style=file -assume-filename=.clang-format -i *.c *.h
 
 .PHONY: clean install
-- 
cgit v1.3.1-26-gb76a


From adfdc1f543588dae9426537b04b3874d76aaf010 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Fri, 15 Mar 2019 16:47:23 +0100
Subject: Makefile: cleaner usage of variables and make it easier to add exec
 targets

---
 Makefile | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f254fcf..6071b41 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,23 @@
-LIBS = $(shell pkg-config --cflags --libs gtk+-3.0 webkit2gtk-4.0)
+CC     ?= cc
+CFLAGS ?= -g -Wall -Wextra
 PREFIX ?= /usr/local
 
-badwolf: badwolf.c config.h
-	$(CC) $(CFLAGS) $(LIBS) -o $@ $<
+DEPS     = gtk+-3.0 webkit2gtk-4.0
+CFLAGS  += $(shell pkg-config --cflags $(DEPS))
+LDFLAGS += $(shell pkg-config --libs $(DEPS))
+OBJS     = badwolf
+
+all: $(OBJS)
+
+.c:
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
 
 install: badwolf
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
 	cp -p badwolf $(DESTDIR)$(PREFIX)/bin/badwolf
 
 clean:
-	rm badwolf
+	rm $(OBJS)
 
 format: *.c *.h
 	clang-format -style=file -assume-filename=.clang-format -i *.c *.h
-- 
cgit v1.3.1-26-gb76a


From 1acb3987e24850c651c85fea7e5355bd75aa81ed Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Wed, 20 Mar 2019 15:47:57 +0100
Subject: Makefile: Make it POSIX

---
 Makefile | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 6071b41..bcc39cc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,13 @@
-CC     ?= cc
-CFLAGS ?= -g -Wall -Wextra
-PREFIX ?= /usr/local
-
-DEPS     = gtk+-3.0 webkit2gtk-4.0
-CFLAGS  += $(shell pkg-config --cflags $(DEPS))
-LDFLAGS += $(shell pkg-config --libs $(DEPS))
-OBJS     = badwolf
+.POSIX:
+
+PREFIX = /usr/local
+
+DEPS = gtk+-3.0 webkit2gtk-4.0
+OBJS = badwolf
+
+CC      = cc -std=c99
+CFLAGS  = -g -Wall -Wextra `pkg-config --cflags $(DEPS)`
+LDFLAGS = `pkg-config --libs $(DEPS)`
 
 all: $(OBJS)
 
-- 
cgit v1.3.1-26-gb76a


From 2877c957673fbb1c1c6b6c96fb12ccf8d393542d Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Thu, 28 Mar 2019 19:38:45 +0100
Subject: Makefile: Properly separate CFLAGS

This allows to simply pass CFLAGS on make without having to care about deps
---
 Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index bcc39cc..21f1c72 100644
--- a/Makefile
+++ b/Makefile
@@ -6,13 +6,14 @@ DEPS = gtk+-3.0 webkit2gtk-4.0
 OBJS = badwolf
 
 CC      = cc -std=c99
-CFLAGS  = -g -Wall -Wextra `pkg-config --cflags $(DEPS)`
-LDFLAGS = `pkg-config --libs $(DEPS)`
+CFLAGS  = -g -Wall -Wextra
+CDEPS   = `pkg-config --cflags $(DEPS)`
+LIBS    = `pkg-config --libs $(DEPS)`
 
 all: $(OBJS)
 
 .c:
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+	$(CC) $(CFLAGS) $(CDEPS) $(LDFLAGS) $(LIBS) -o $@ $<
 
 install: badwolf
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
-- 
cgit v1.3.1-26-gb76a