From ae87efc0a279eec4a5893064ecb42e0c847aa7d0 Mon Sep 17 00:00:00 2001 From: Nikos Tsipinakis Date: Wed, 4 Jan 2017 10:38:34 +0200 Subject: [PATCH] Fix a few minor issues in the makefile & remove debug target * Fix a bug that would cause distclean to fail if config.h didn't exist * Make sure the options target is run when running make dunst * Remove debug target as the optimization override it was doing was only applied in the linking phase. Optimizations are applied during compilation, not linking, and I don't see any easy way to fix that so let's drop the target entirely. --- Makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 8fec342..05fbe19 100644 --- a/Makefile +++ b/Makefile @@ -33,17 +33,13 @@ config.h: config.def.h @echo creating $@ from $< @cp $< $@ -dunst: ${OBJ} main.o +dunst: options ${OBJ} main.o @echo "${CC} ${CFLAGS} -o $@ ${OBJ} ${LDFLAGS}" @${CC} ${CFLAGS} -o $@ ${OBJ} main.o ${LDFLAGS} dunstify: @${CC} ${CFLAGS} -o $@ dunstify.c -std=c99 $(shell pkg-config --libs --cflags glib-2.0 libnotify) -debug: ${OBJ} - @echo CC -o $@ - @${CC} ${CFLAGS} -O0 -o dunst ${OBJ} ${LDFLAGS} - clean-dunst: rm -f dunst ${OBJ} main.o rm -f org.knopwob.dunst.service @@ -60,7 +56,7 @@ clean: clean-dunst clean-dunstify clean-doc test-clean distclean: clean clean-config clean-config: - rm config.h + rm -f config.h doc: docs/dunst.1 docs/dunst.1: docs/dunst.pod