nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace Makefile commands with default variables

Browse Source
This commit is contained in:
Benedikt Heine 2019-02-02 16:43:30 +01:00
parent 6df6a50900
commit 4590514906
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Makefile
View File

@ -5,13 +5,13 @@ include config.mk
VERSION := "1.3.2-non-git" VERSION := "1.3.2-non-git"
ifneq ($(wildcard ./.git/),) ifneq ($(wildcard ./.git/),)
VERSION := $(shell git describe --tags) VERSION := $(shell ${GIT} describe --tags)
endif endif
ifeq (,${SYSTEMD}) ifeq (,${SYSTEMD})
# Check for systemctl to avoid discrepancies on systems, where # Check for systemctl to avoid discrepancies on systems, where
# systemd is installed, but systemd.pc is in another package # systemd is installed, but systemd.pc is in another package
systemctl := $(shell command -v systemctl >/dev/null && echo systemctl) systemctl := $(shell command -v ${SYSTEMCTL} >/dev/null && echo systemctl)
ifeq (systemctl,${systemctl}) ifeq (systemctl,${systemctl})
SYSTEMD := 1 SYSTEMD := 1
else else
@ -45,9 +45,9 @@ endif
CFLAGS := ${DEFAULT_CPPFLAGS} ${CPPFLAGS} ${DEFAULT_CFLAGS} ${CFLAGS} ${INCS} -MMD -MP CFLAGS := ${DEFAULT_CPPFLAGS} ${CPPFLAGS} ${DEFAULT_CFLAGS} ${CFLAGS} ${INCS} -MMD -MP
LDFLAGS := ${DEFAULT_LDFLAGS} ${LDFLAGS} ${LIBS} LDFLAGS := ${DEFAULT_LDFLAGS} ${LDFLAGS} ${LIBS}
SRC := $(sort $(shell find src/ -name '*.c')) SRC := $(sort $(shell ${FIND} src/ -name '*.c'))
OBJ := ${SRC:.c=.o} OBJ := ${SRC:.c=.o}
TEST_SRC := $(sort $(shell find test/ -name '*.c')) TEST_SRC := $(sort $(shell ${FIND} test/ -name '*.c'))
TEST_OBJ := $(TEST_SRC:.c=.o) TEST_OBJ := $(TEST_SRC:.c=.o)
DEPS := ${SRC:.c=.d} ${TEST_SRC:.c=.d} DEPS := ${SRC:.c=.d} ${TEST_SRC:.c=.d}
@ -78,7 +78,7 @@ test: test/test clean-coverage-run
./test/test -v ./test/test -v
test-valgrind: test/test test-valgrind: test/test
valgrind \ ${VALGRIND} \
--suppressions=.valgrind.suppressions \ --suppressions=.valgrind.suppressions \
--leak-check=full \ --leak-check=full \
--show-leak-kinds=definite \ --show-leak-kinds=definite \
@ -92,7 +92,7 @@ test-coverage: test
test-coverage-report: test-coverage test-coverage-report: test-coverage
mkdir -p docs/internal/coverage mkdir -p docs/internal/coverage
gcovr \ ${GCOVR} \
-r . \ -r . \
--exclude=test \ --exclude=test \
--html \ --html \
@ -108,18 +108,18 @@ test/test: ${OBJ} ${TEST_OBJ}
.PHONY: doc doc-doxygen .PHONY: doc doc-doxygen
doc: docs/dunst.1 doc: docs/dunst.1
docs/dunst.1: docs/dunst.pod docs/dunst.1: docs/dunst.pod
pod2man --name=dunst -c "Dunst Reference" --section=1 --release=${VERSION} $< > $@ ${POD2MAN} --name=dunst -c "Dunst Reference" --section=1 --release=${VERSION} $< > $@
doc-doxygen: doc-doxygen:
doxygen docs/internal/Doxyfile ${DOXYGEN} docs/internal/Doxyfile
.PHONY: service service-dbus service-systemd .PHONY: service service-dbus service-systemd
service: service-dbus service: service-dbus
service-dbus: service-dbus:
@sed "s|##PREFIX##|$(PREFIX)|" org.knopwob.dunst.service.in > org.knopwob.dunst.service @${SED} "s|##PREFIX##|$(PREFIX)|" org.knopwob.dunst.service.in > org.knopwob.dunst.service
ifneq (0,${SYSTEMD}) ifneq (0,${SYSTEMD})
service: service-systemd service: service-systemd
service-systemd: service-systemd:
@sed "s|##PREFIX##|$(PREFIX)|" dunst.systemd.service.in > dunst.systemd.service @${SED} "s|##PREFIX##|$(PREFIX)|" dunst.systemd.service.in > dunst.systemd.service
endif endif
.PHONY: clean clean-dunst clean-dunstify clean-doc clean-tests clean-coverage clean-coverage-run .PHONY: clean clean-dunst clean-dunstify clean-doc clean-tests clean-coverage clean-coverage-run
@ -143,12 +143,12 @@ clean-tests:
rm -f test/test test/*.o test/*.d rm -f test/test test/*.o test/*.d
clean-coverage: clean-coverage-run clean-coverage: clean-coverage-run
find . -type f -name '*.gcno' -delete ${FIND} . -type f -name '*.gcno' -delete
find . -type f -name '*.gcna' -delete ${FIND} . -type f -name '*.gcna' -delete
# Cleans the coverage data before every run to not double count any lines # Cleans the coverage data before every run to not double count any lines
clean-coverage-run: clean-coverage-run:
find . -type f -name '*.gcov' -delete ${FIND} . -type f -name '*.gcov' -delete
find . -type f -name '*.gcda' -delete ${FIND} . -type f -name '*.gcda' -delete
.PHONY: install install-dunst install-doc \ .PHONY: install install-dunst install-doc \
install-service install-service-dbus install-service-systemd \ install-service install-service-dbus install-service-systemd \

8
config.mk
View File

@ -5,7 +5,15 @@ DATADIR ?= ${PREFIX}/share
MANPREFIX ?= ${DATADIR}/man # around for backwards compatibility MANPREFIX ?= ${DATADIR}/man # around for backwards compatibility
MANDIR ?= ${MANPREFIX} MANDIR ?= ${MANPREFIX}
DOXYGEN ?= doxygen
FIND ?= find
GCOVR ?= gcovr
GIT ?= git
PKG_CONFIG ?= pkg-config PKG_CONFIG ?= pkg-config
POD2MAN ?= pod2man
SED ?= sed
SYSTEMCTL ?= systemctl
VALGRIND ?= valgrind
# Disable systemd service file installation, # Disable systemd service file installation,
# if you don't want to use systemd albeit installed # if you don't want to use systemd albeit installed