diff --git a/GNUmakefile b/GNUmakefile index 656f39f..97cb86f 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -6,9 +6,9 @@ CFLAGS := -O3 -Wall -Wextra X11CFLAGS := $(shell pkg-config --cflags x11) X11LIBS := $(shell pkg-config --libs x11) -all: dwmblocks/dwmblocks sigdwmblocks/sigdwmblocks xgetrootname/xgetrootname +all: dwmblocks sigdwmblocks/sigdwmblocks xgetrootname/xgetrootname -dwmblocks/dwmblocks: dwmblocks/dwmblocks.c config.h dwmblocks/block.h +dwmblocks: dwmblocks.c config.h block.h ${CC} -o $@ -Wno-missing-field-initializers -Wno-unused-parameter ${CFLAGS} ${X11CFLAGS} $< ${X11LIBS} sigdwmblocks/sigdwmblocks: sigdwmblocks/sigdwmblocks.c @@ -18,11 +18,11 @@ xgetrootname/xgetrootname: xgetrootname/xgetrootname.c ${CC} -o $@ ${CFLAGS} ${X11CFLAGS} $< ${X11LIBS} clean: - rm -f dwmblocks/dwmblocks sigdwmblocks/sigdwmblocks xgetrootname/xgetrootname + rm -f dwmblocks sigdwmblocks/sigdwmblocks xgetrootname/xgetrootname install: all mkdir -p ${DESTDIR}${PREFIX}/bin - install -m 0755 dwmblocks/dwmblocks ${DESTDIR}${PREFIX}/bin/dwmblocks + install -m 0755 dwmblocks ${DESTDIR}${PREFIX}/bin/dwmblocks install -m 0755 sigdwmblocks/sigdwmblocks ${DESTDIR}${PREFIX}/bin/sigdwmblocks install -m 0755 xgetrootname/xgetrootname ${DESTDIR}${PREFIX}/bin/xgetrootname diff --git a/dwmblocks/block.h b/block.h similarity index 100% rename from dwmblocks/block.h rename to block.h diff --git a/dwmblocks b/dwmblocks new file mode 100755 index 0000000..c1a188c Binary files /dev/null and b/dwmblocks differ diff --git a/dwmblocks/dwmblocks.c b/dwmblocks.c similarity index 100% rename from dwmblocks/dwmblocks.c rename to dwmblocks.c