Merge branch 'master' into fix/gitignore

This commit is contained in:
fenze 2022-05-14 20:46:47 +02:00 committed by GitHub
commit 7b7542d08a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 6 deletions

12
.editorconfig Normal file
View File

@ -0,0 +1,12 @@
root = true
[*]
indent_style = tab
charset = utf-8
end_of_line = lf
trim_trailing_whitespace = true
insert_final_newline = true
[*.md]
charset = utf-8
trim_trailing_whitespace = true

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
compile_commands.json compile_commands.json
rose rose
.cache/ .cache/
/config.h

View File

@ -1,4 +1,5 @@
CC = clang # -*- indent-tabs-mode: t -*-
CC ?= cc
CFLAGS = `pkg-config --cflags gtk4 webkit2gtk-5.0 x11` CFLAGS = `pkg-config --cflags gtk4 webkit2gtk-5.0 x11`
LIBS = `pkg-config --libs gtk4 webkit2gtk-5.0 x11` LIBS = `pkg-config --libs gtk4 webkit2gtk-5.0 x11`
OPTIONS = -Dgtk_doc=false -Dintrospection=false \ OPTIONS = -Dgtk_doc=false -Dintrospection=false \
@ -16,19 +17,32 @@ OPTIONS = -Dgtk_doc=false -Dintrospection=false \
-Db_coverage=false \ -Db_coverage=false \
-Ddebug=false -Ddebug=false
PREFIX ?= /usr/local
all: all: config.h rose
${CC} -fPIC -O3 -o rose *.c $(CFLAGS) $(LIBS) $(OPTIONS)
rose:
$(CC) -fPIC -O3 -o rose *.c $(CFLAGS) $(LIBS) $(OPTIONS)
strip ./rose strip ./rose
config.h:
[ -f "$@" ] || cp config.def.h $@
install: all install: all
su -c "cp -f ./rose /usr/local/bin/rose && \ cp -f ./rose $(PREFIX)/bin/rose
cp -f ./scripts/dmenu_rose.sh /usr/local/bin/dmenu_rose" cp -f ./scripts/dmenu_rose.sh $(PREFIX)/bin/dmenu_rose
uninstall:
rm -f $(PREFIX)/bin/rose $(PREFIX)/bin/dmenu_rose
clean: clean:
rm -f rose compile_flags.txt rm -f rose compile_flags.txt
clean-all: clean
rm -f config.h
flags: flags:
echo $(CFLAGS) | sed 's/ /\n/g' > compile_flags.txt echo $(CFLAGS) | sed 's/ /\n/g' > compile_flags.txt
.SILENT: all clean install flags .PHONY: all clean clean-all install uninstall flags config.h
.SILENT: all clean clean-all install uninstall flags config.h