From 18f4e3e3cb544fc26312ce8b3e5f9fbc57ba5884 Mon Sep 17 00:00:00 2001 From: NunoSempere Date: Tue, 28 Mar 2023 11:11:18 -0600 Subject: [PATCH] tweak: add formatter to makefile --- makefile | 31 +++++++++++++------ .../artifacts/compile_flags/compile_flags.txt | 0 .../compile_flags/get-compile-flags.sh | 5 +++ 3 files changed, 27 insertions(+), 9 deletions(-) rename compile_flags.txt => user-scripts/artifacts/compile_flags/compile_flags.txt (100%) create mode 100644 user-scripts/artifacts/compile_flags/get-compile-flags.sh diff --git a/makefile b/makefile index aca96da..acfb87c 100644 --- a/makefile +++ b/makefile @@ -1,4 +1,9 @@ -# Variables +# make +# make build +# (sudo) make install +# make format +# make clean +# make uninstall ## C compiler CC=clang @@ -13,27 +18,31 @@ DEBUG= #'-g' INCS=`pkg-config --cflags ${DEPS}` LIBS=`pkg-config --libs ${DEPS}` -# Plugins -# REQS=./plugins/stand_in/stand_in.c +## Optional adblocking +## depends on https://github.com/jun7/wyebadblock +ADBLOCK='-L/usr/lib/wyebrowser/adblock.so' + +## Plugins LIBRE_REDIRECT=./plugins/libre_redirect/libre_redirect.c ./plugins/libre_redirect/str_replace_start.c READABILITY=./plugins/readability/readability.c -STYLE=./plugins/style/style.c +CUSTOM_STYLES=./plugins/style/style.c STAND_IN=./plugins/stand_in/stand_in.c # gives function definitions for the above, which do nothing -PLUGS=$(LIBRE_REDIRECT) $(READABILITY) $(STYLE) +PLUGS=$(LIBRE_REDIRECT) $(READABILITY) $(CUSTOM_STYLES) # PLUGS=$(STAND_IN) # Note that if you want some plugins but not others, # You should edit the stand_in.c file -# Optional adblocking -# depends on https://github.com/jun7/wyebadblock -ADBLOCK='-L/usr/lib/wyebrowser/adblock.so' - # CONFIG CONFIG=config.h # cp -f config.def.h config.h +## Formatter +STYLE_BLUEPRINT=webkit +FORMATTER=clang-format -i -style=$(STYLE_BLUEPRINT) +## Commands + build: $(SRC) $(PLUGS) $(CONFIG) $(CC) $(DEBUG) $(INCS) $(PLUGS) $(SRC) -o rose $(LIBS) $(ADBLOCK) @@ -43,3 +52,7 @@ install: rose cp style.css /usr/share/themes/rose/ cp rose-mklink /usr/bin +format: $(SRC) $(PLUGS) + $(FORMATTER) $(SRC) $(PLUGS) + + diff --git a/compile_flags.txt b/user-scripts/artifacts/compile_flags/compile_flags.txt similarity index 100% rename from compile_flags.txt rename to user-scripts/artifacts/compile_flags/compile_flags.txt diff --git a/user-scripts/artifacts/compile_flags/get-compile-flags.sh b/user-scripts/artifacts/compile_flags/get-compile-flags.sh new file mode 100644 index 0000000..aaa9e01 --- /dev/null +++ b/user-scripts/artifacts/compile_flags/get-compile-flags.sh @@ -0,0 +1,5 @@ +DEPS='webkit2gtk-4.0' +INCS=`pkg-config --cflags ${DEPS}` +LIBS=`pkg-config --libs ${DEPS}` +echo $INCS +echo $LIBS