From 3f33238e3a8096df6748f5a38e34f6a9559d55f7 Mon Sep 17 00:00:00 2001 From: Armaan Bhojwani Date: Sun, 6 Jun 2021 09:40:53 -0400 Subject: [PATCH] Move extensions into a subdirectory --- .gitignore | 2 +- Makefile | 21 ++++++++++++--------- we_adblock.c => extensions/we_adblock.c | 0 3 files changed, 13 insertions(+), 10 deletions(-) rename we_adblock.c => extensions/we_adblock.c (100%) diff --git a/.gitignore b/.gitignore index c296e42..3af3cda 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ lariza -we_adblock.so +*.so darkreader.js *.1 *.5 \ No newline at end of file diff --git a/Makefile b/Makefile index b664dc3..cec3e11 100644 --- a/Makefile +++ b/Makefile @@ -8,9 +8,9 @@ datarootdir = $(prefix)/share mandir = $(datarootdir)/man/man1 datadir = $(prefix)/share -.PHONY: man lariza we_adblock.so clean uninstall install +.PHONY: man lariza extensions clean uninstall install -all: man lariza we_adblock.so darkreader +all: man lariza extensions darkreader man: for i in man1/*.scd; do \ @@ -25,12 +25,15 @@ lariza: browser.c -o $@ $< \ `pkg-config --cflags --libs gtk+-3.0 glib-2.0 webkit2gtk-4.0` -we_adblock.so: we_adblock.c - $(CC) $(CFLAGS) $(LDFLAGS) \ - -D__NAME__=\"lariza\" \ - -D__NAME_UPPERCASE__=\"LARIZA\" \ - -shared -o $@ -fPIC $< \ - `pkg-config --cflags --libs glib-2.0 webkit2gtk-4.0` +extensions: + for i in extensions/*.c; do \ + outp=$$(echo "$$i" | sed 's/\$\.c/.so/g'); \ + $(CC) $(CFLAGS) $(LDFLAGS) \ + -D__NAME__=\"lariza\" \ + -D__NAME_UPPERCASE__=\"LARIZA\" \ + -shared -o $$outp -fPIC $$i \ + `pkg-config --cflags --libs glib-2.0 webkit2gtk-4.0`; \ + done install: all mkdir -p $(DESTDIR)$(bindir) \ @@ -39,9 +42,9 @@ install: all $(DESTDIR)$(datadir)/lariza/user-scripts cp lariza $(DESTDIR)$(bindir)/lariza - cp we_adblock.so $(DESTDIR)$(libdir)/lariza/web_extensions/we_adblock.so cp man1/* $(DESTDIR)$(mandir)/ cp lariza.ini $(DESTDIR)/etc/lariza.ini + cp -r extensions/*.so $(DESTDIR)$(libdir)/lariza/web_extensions/ cp -r user-scripts/* $(DESTDIR)$(datadir)/lariza/user-scripts/ uninstall: diff --git a/we_adblock.c b/extensions/we_adblock.c similarity index 100% rename from we_adblock.c rename to extensions/we_adblock.c -- 2.39.2