Commit Diff


commit - 4b44c2212d0e8cde01b3358c29105e1c9946f2e8
commit + a20ff3ff0fde0e491b71a745cddec65a4072de66
blob - 3d9531642281a9476599b0c316d432008afc9dd5
blob + 2ffc7b8043f388e465ebe84ecc7fefa2aa632d3c
--- Makefile
+++ Makefile
@@ -1,18 +1,16 @@
 # Makefile
 #
 # bxbar
-#
 # A very basic X status bar, a.k.a. Brett's X status bar.
 # See LICENSE.md and README.md for details.
 
 PREFIX ?= $(HOME)/.local
-LUADIR ?= $(PREFIX)/share/lua/5.4/bxbar
 CC ?= cc
-CFLAGS = -std=c99 -Wall -Wextra $(shell pkg-config --cflags xft)
+CFLAGS = -std=c11 -pedantic -Wall -Wextra $(shell pkg-config --cflags xft)
 LDFLAGS = 
 LDLIBS = $(shell pkg-config --libs xft x11)
 
-all: bxbar
+all: bxbar bxinfo
 
 bxbar: bxbar.o
 	$(CC) $(LDFLAGS) -o $@ bxbar.o $(LDLIBS)
@@ -23,26 +21,23 @@ config.h:
 bxbar.o: bxbar.c config.h
 	$(CC) $(CFLAGS) -c -o $@ $<
 
+bxinfo: bxinfo.o
+	$(CC) -o $@ bxinfo.o -lX11
+
 clean:
 	rm -f bxbar bxbar.o
+	rm -f bxinfo bxinfo.o
 
 install:
 	install -d $(DESTDIR)$(PREFIX)/bin
 	install -m 755 bxbar $(DESTDIR)$(PREFIX)/bin/bxbar
+	install -m 755 bxinfo $(DESTDIR)$(PREFIX)/bin/bxinfo
+	install -m 755 bxbar-ctl.lua $(DESTDIR)$(PREFIX)/bin/bxbar-ctl
 
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/bxbar
+	rm -f $(DESTDIR)$(PREFIX)/bin/bxinfo
+	rm -f $(DESTDIR)$(PREFIX)/bin/bxbar-ctl
 
-install-lua:
-	install -d $(DESTDIR)$(PREFIX)/bin
-	install -m 755 lua/manage-bxbar $(DESTDIR)$(PREFIX)/bin/manage-bxbar
-	install -d $(DESTDIR)$(LUADIR)
-	install -m 644 lua/bxbar/workspace.lua $(DESTDIR)$(LUADIR)/workspace.lua
-	install -m 644 lua/bxbar/datetime.lua $(DESTDIR)$(LUADIR)/datetime.lua
+.PHONY: all clean install uninstall
 
-uninstall-lua:
-	rm -f $(DESTDIR)$(PREFIX)/bin/manage-bxbar
-	rm -rf $(DESTDIR)$(LUADIR)
-
-.PHONY: all clean install uninstall install-lua uninstall-lua
-