From 881c84fc95337e000bb7558d4438e5cc771c5641 Mon Sep 17 00:00:00 2001
From: jun7 <jun7@hush.com>
Date: Wed, 6 Jun 2018 14:10:35 +0900
Subject: [PATCH] Clean up make

---
 ab.c     | 8 +++-----
 makefile | 7 ++-----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/ab.c b/ab.c
index a3d329c..e41742f 100644
--- a/ab.c
+++ b/ab.c
@@ -30,13 +30,11 @@ along with wyebadblock.  If not, see <http://www.gnu.org/licenses/>.
 
 #if ISEXT
 
-#define EXE "wyebab"
-
 #include <webkit2/webkit-web-extension.h>
 static bool check(const char *requri, const char *pageuri)
 {
 	char *uris = g_strconcat(requri, " ", pageuri, NULL);
-	char *ruri = wyebget(EXE, uris);
+	char *ruri = wyebget(EXENAME, uris);
 	g_free(uris);
 
 	if (ruri && !*ruri) return false;
@@ -65,7 +63,7 @@ static gboolean reqcb(WebKitWebPage *kp, WebKitURIRequest *req,
 static gboolean keepcb(WebKitWebPage *kp)
 {
 	if (g_object_get_data(G_OBJECT(kp), "adblock") != (gpointer)'n')
-		wyebkeep(EXE, 30);
+		wyebkeep(EXENAME, 30);
 	return true;
 }
 
@@ -140,7 +138,7 @@ static void init()
 {
 	DD(wyebad init)
 	char *path = g_build_filename(
-			g_get_user_config_dir(), APPNAME, "easylist.txt", NULL);
+			g_get_user_config_dir(), DIRNAME, "easylist.txt", NULL);
 
 	GFile *gf = g_file_new_for_path(path);
 	GFileMonitor *gm = g_file_monitor_file(gf,
diff --git a/makefile b/makefile
index 8233946..d47225a 100644
--- a/makefile
+++ b/makefile
@@ -1,5 +1,4 @@
 EXTENSION_DIR=$(DESTDIR)/usr/lib/wyebrowser
-DAPPNAME=-DAPPNAME='"wyebadblock"'
 ifeq ($(DEBUG), 1)
 	CFLAGS += -Wall
 else
@@ -13,14 +12,12 @@ all: adblock.so wyebab librun.o testrun
 adblock.so: ab.c ephy-uri-tester.c ephy-uri-tester.h librun.o makefile
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< librun.o -shared -fPIC \
 		`pkg-config --cflags --libs gtk+-3.0 glib-2.0 webkit2gtk-4.0` \
-		-DEXTENSION_DIR=\"$(EXTENSION_DIR)\" \
-		$(DDEBUG) -DISEXT
+		$(DDEBUG) -DISEXT -DEXENAME=\"wyebab\"
 
 wyebab: ab.c ephy-uri-tester.c ephy-uri-tester.h librun.o makefile
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< librun.o \
 		`pkg-config --cflags --libs glib-2.0 gio-2.0` \
-		-DEXTENSION_DIR=\"$(EXTENSION_DIR)\" \
-		$(DDEBUG) $(DAPPNAME)
+		$(DDEBUG) -DDIRNAME=\"wyebadblock\"
 
 librun.o: wyebrun.c wyebrun.h makefile
 	$(CC) $(CFLAGS) $(LDFLAGS) -c -o $@ $< -fPIC\