diff --git a/.gitignore b/.gitignore index dc0ae36..c7ed4ea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ modules/* +.cache/ dim - +compile_commands.json diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..e92cdaa --- /dev/null +++ b/Makefile @@ -0,0 +1,26 @@ +BIN=./dim +CC=gcc +CCARGS=-Isrc/include -Wall -pedantic + +MODULES= \ + modules/clock.dim \ + modules/battery.dim\ + + +all: $(BIN) $(MODULES) compile_commands.json + +$(BIN): src/main.c src/plug.c + $(CC) -o $@ $^ $(CCARGS) -lX11 -ldl + + +modules/%.dim: src/modules/%.c + $(CC) -o $@ $^ -rdynamic -shared -fPIC $(CCARGS) + +compile_commands.json: + compiledb -n make + + + + + + diff --git a/build.sh b/build.sh deleted file mode 100755 index 610e962..0000000 --- a/build.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/bash - -set -xe - -CCARGS="-Isrc/include -Wall -pedantic" - -cc -o dim src/main.c src/plug.c $CCARGS -lX11 -ldl -cc -o modules/clocky.dim src/modules/clock.c -rdynamic -shared -fPIC $CCARGS -cc -o modules/battery.dim src/modules/battery.c -rdynamic -shared -fPIC $CCARGS - -