Zach's git repos / suggpicker
suggestion picker: a persistent layer to complement virtual keyboards like wvkbd
Diffstat
-rw-r--r--Makefile10
-rw-r--r--README.md2
-rw-r--r--config.mk2
-rw-r--r--main.c2
4 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 85e8cf3..ac9250b 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ SRC=.
PKGS = wayland-client xkbcommon pangocairo
-WVKBD_SOURCES += $(wildcard $(SRC)/*.c)
-WVKBD_HEADERS += $(wildcard $(SRC)/*.h)
+MY_SOURCES += $(wildcard $(SRC)/*.c)
+MY_HEADERS += $(wildcard $(SRC)/*.h)
CFLAGS += -std=gnu99 -Wall -g -DWITH_WAYLAND_SHM
CFLAGS += $(shell pkg-config --cflags $(PKGS))
@@ -17,7 +17,7 @@ WAYLAND_HEADERS = $(wildcard proto/*.xml)
HDRS = $(WAYLAND_HEADERS:.xml=-client-protocol.h)
WAYLAND_SRC = $(HDRS:.h=.c)
-SOURCES = $(WVKBD_SOURCES) $(WAYLAND_SRC)
+SOURCES = $(MY_SOURCES) $(WAYLAND_SRC)
OBJECTS = $(SOURCES:.c=.o)
@@ -29,7 +29,7 @@ proto/%-client-protocol.c: proto/%.xml
proto/%-client-protocol.h: proto/%.xml
wayland-scanner client-header < $? > $@
-$(OBJECTS): $(HDRS) $(WVKBD_HEADERS)
+$(OBJECTS): $(HDRS) $(MY_HEADERS)
${BIN}: config.h $(OBJECTS)
$(CC) -o ${BIN} $(OBJECTS) $(LDFLAGS)
@@ -38,7 +38,7 @@ clean:
rm -f $(OBJECTS) $(HDRS) $(WAYLAND_SRC) ${BIN}
format:
- clang-format -i $(WVKBD_SOURCES) $(WVKBD_HEADERS)
+ clang-format -i $(MY_SOURCES) $(MY_HEADERS)
install: all
mkdir -p ${DESTDIR}${PREFIX}/bin
diff --git a/README.md b/README.md
index fae9f67..ea2dca5 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ You'll need the following developer packages
- wayland-client
- xkbcommon
-Make any customizations you would like in `config.def.h` and run `make`
+Make any customizations you would like in `config.h` and run `make`
## Usage
diff --git a/config.mk b/config.mk
index d52491b..82b0539 100644
--- a/config.mk
+++ b/config.mk
@@ -1,2 +1,2 @@
-VERSION = 0.2
+VERSION = 0.0.0
CFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=700
diff --git a/main.c b/main.c
index a8f63da..62b80e9 100644
--- a/main.c
+++ b/main.c
@@ -407,7 +407,7 @@ main(int argc, char **argv) {
int i;
for (i = 1; argv[i]; i++) {
if ((!strcmp(argv[i], "-v")) || (!strcmp(argv[i], "--version"))) {
- printf("wvkbd-%s", VERSION);
+ printf("suggpicker-%s", VERSION);
exit(0);
} else if ((!strcmp(argv[i], "-h")) || (!strcmp(argv[i], "--help"))) {
usage(argv[0]);