mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2024-12-28 23:16:02 +01:00
Code Issues Projects Releases Packages Wiki Activity

We need to check if macros are already defined in CPPFLAGS before setting them.

Browse source
This commit is contained in:
Sebastian Ramacher 2012-03-05 09:51:27 +01:00
parent 1998fdcb5a
commit 9f31c38cca
6 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -102,6 +102,7 @@ doc:
gcov: clean gcov: clean
$(QUIET)CFLAGS="${CFLAGS}-fprofile-arcs -ftest-coverage" LDFLAGS="${LDFLAGS} -fprofile-arcs" ${MAKE} $(PROJECT) $(QUIET)CFLAGS="${CFLAGS}-fprofile-arcs -ftest-coverage" LDFLAGS="${LDFLAGS} -fprofile-arcs" ${MAKE} $(PROJECT)
$(QUIET)CFLAGS="${CFLAGS}-fprofile-arcs -ftest-coverage" LDFLAGS="${LDFLAGS} -fprofile-arcs" ${MAKE} -C tests run
$(QUIET)${MAKE} -C tests $(QUIET)${MAKE} -C tests
$(QUIET)lcov --directory . --capture --output-file $(PROJECT).info $(QUIET)lcov --directory . --capture --output-file $(PROJECT).info
$(QUIET)genhtml --output-directory gcov $(PROJECT).info $(QUIET)genhtml --output-directory gcov $(PROJECT).info

11
config.mk
View file

@ -43,7 +43,16 @@ LIBS = ${GIRARA_LIB} ${GTK_LIB} ${DL_LIB} -lpthread -lm
# flags # flags
CFLAGS += -std=c99 -pedantic -Wall -Wno-format-zero-length -Wextra $(INCS) CFLAGS += -std=c99 -pedantic -Wall -Wno-format-zero-length -Wextra $(INCS)
CPPFLAGS += -DZATHURA_PLUGINDIR=\"${PLUGINDIR}\" -DGETTEXT_PACKAGE=\"${PROJECT}\" -DLOCALEDIR=\"${LOCALEDIR}\"
ifeq (,$(findstring -DZATHURA_PLUGINDIR,${CPPFLAGS}))
CPPFLAGS += -DZATHURA_PLUGINDIR=\"${PLUGINDIR}\"
endif
ifeq (,$(findstring -DGETTEXT_PACKAGE,${CPPFLAGS}))
CPPFLAGS += -DGETTEXT_PACKAGE=\"${PROJECT}\"
endif
ifeq (,$(findstring -DLOCALEDIR,${CPPFLAGS}))
CPPFLAGS += -DLOCALEDIR=\"${LOCALEDIR}\"
endif
# debug # debug
DFLAGS ?= -g DFLAGS ?= -g

2
po/de.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-03-05 08:21+0100\n" "POT-Creation-Date: 2012-03-05 09:33+0100\n"
"PO-Revision-Date: 2012-03-04 17:77+0100\n" "PO-Revision-Date: 2012-03-04 17:77+0100\n"
"Last-Translator: Sebastian Ramacher <s.ramacher@gmx.at>\n" "Last-Translator: Sebastian Ramacher <s.ramacher@gmx.at>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

2
po/zathura.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-03-05 08:21+0100\n" "POT-Creation-Date: 2012-03-05 09:33+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

9
tests/Makefile
View file

@ -8,16 +8,15 @@ PROJECT = tests
SOURCE = tests.c $(wildcard test_*.c) SOURCE = tests.c $(wildcard test_*.c)
OBJECTS = ${SOURCE:.c=.o} OBJECTS = ${SOURCE:.c=.o}
ZSOURCE = $(shell find ../ -maxdepth 1 -iname "*.c" -a ! -iname "database-*" ! -iname "main.c") ZSOURCE = $(shell find ../ -maxdepth 1 -iname "*.c" -a ! -iname "database-sqlite.c" ! -iname "main.c")
ZOBJECTS = ${ZSOURCE:.c=.o} ZOBJECTS = ${ZSOURCE:.c=.o}
ifeq (${DATABASE}, sqlite) ifneq (${WITH_SQLITE},0)
INCS += $(SQLITE_INC) INCS += $(SQLITE_INC)
LIBS += $(SQLITE_LIB) LIBS += $(SQLITE_LIB)
ZSOURCE += ../database-sqlite.c ZSOURCE += ../database-sqlite.c
else ifeq (,$(findstring -DWITH_SQLITE,${CPPFLAGS}))
ifeq (${DATABASE}, plain) CPPFLAGS += -DWITH_SQLITE
ZSOURCE += ../database-plain.c
endif endif
endif endif

3
tests/config.mk
View file

@ -4,6 +4,3 @@ CHECK_INC ?= $(shell pkg-config --cflags check)
CHECK_LIB ?= $(shell pkg-config --libs check) CHECK_LIB ?= $(shell pkg-config --libs check)
LIBS += ${CHECK_LIB} LIBS += ${CHECK_LIB}
CFLAGS += -fprofile-arcs -ftest-coverage
LDFLAGS += -fprofile-arcs