Remove config.def.h and only use config.h

This commit is contained in:
Benedikt Heine 2017-09-25 22:32:06 +02:00
parent 7965fd3e9f
commit 20414cc3a3
3 changed files with 1 additions and 12 deletions

1
.gitignore vendored
View File

@ -2,7 +2,6 @@ dunst
*.o *.o
core core
vgcore.* vgcore.*
config.h
dunst.1 dunst.1
org.knopwob.dunst.service org.knopwob.dunst.service
dunst.systemd.service dunst.systemd.service

View File

@ -14,12 +14,7 @@ all: doc dunst service
.c.o: .c.o:
${CC} -o $@ -c $< ${CFLAGS} ${CC} -o $@ -c $< ${CFLAGS}
${OBJ}: config.h config.mk ${OBJ}: config.mk
config.h: config.def.h
@if test -s $@; then echo $< is newer than $@, merge and save $@. If you haven\'t edited $@ you can just delete it && exit 1; fi
@echo creating $@ from $<
@cp $< $@
dunst: ${OBJ} main.o dunst: ${OBJ} main.o
${CC} ${CFLAGS} -o $@ ${OBJ} main.o ${LDFLAGS} ${CC} ${CFLAGS} -o $@ ${OBJ} main.o ${LDFLAGS}
@ -38,11 +33,6 @@ clean-doc:
clean: clean-dunst clean-dunstify clean-doc test-clean clean: clean-dunst clean-dunstify clean-doc test-clean
distclean: clean clean-config
clean-config:
rm -f config.h
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} $< > $@