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

Merge branch 'develop' of pwmt.org:zathura into develop

Browse source
This commit is contained in:
Moritz Lipp 2014-11-29 19:42:00 +01:00
commit 50ec6192be
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -12,7 +12,7 @@ LIBS += $(SQLITE_LIB)
SOURCE = $(OSOURCE) SOURCE = $(OSOURCE)
CPPFLAGS += -DWITH_SQLITE CPPFLAGS += -DWITH_SQLITE
else else
SOURCE = $(filter-out database-sqlite.c,$(OSOURCE)) SOURCE = $(filter-out ${PROJECT}/database-sqlite.c,$(OSOURCE))
endif endif
ifneq ($(WITH_MAGIC),0) ifneq ($(WITH_MAGIC),0)
@ -87,8 +87,8 @@ ${PROJECT}/version.h: ${PROJECT}/version.h.in config.mk
-e 's/ZVMINOR/${ZATHURA_VERSION_MINOR}/' \ -e 's/ZVMINOR/${ZATHURA_VERSION_MINOR}/' \
-e 's/ZVREV/${ZATHURA_VERSION_REV}/' \ -e 's/ZVREV/${ZATHURA_VERSION_REV}/' \
-e 's/ZVAPI/${ZATHURA_API_VERSION}/' \ -e 's/ZVAPI/${ZATHURA_API_VERSION}/' \
-e 's/ZVABI/${ZATHURA_ABI_VERSION}/' ${PROJECT}/version.h.in > version.h.tmp -e 's/ZVABI/${ZATHURA_ABI_VERSION}/' ${PROJECT}/version.h.in > ${PROJECT}/version.h.tmp
$(QUIET)mv version.h.tmp ${PROJECT}/version.h $(QUIET)mv ${PROJECT}/version.h.tmp ${PROJECT}/version.h
${PROJECT}/dbus-interface-definitions.c: data/org.pwmt.zathura.xml ${PROJECT}/dbus-interface-definitions.c: data/org.pwmt.zathura.xml
$(QUIET)echo '#include "dbus-interface-definitions.h"' > $@.tmp $(QUIET)echo '#include "dbus-interface-definitions.h"' > $@.tmp
@ -298,7 +298,7 @@ uninstall: uninstall-headers
$(QUIET)rm -f $(DESTDIR)$(APPDATAPREFIX)/$(PROJECT).appdata.xml $(QUIET)rm -f $(DESTDIR)$(APPDATAPREFIX)/$(PROJECT).appdata.xml
$(MAKE) -C po uninstall $(MAKE) -C po uninstall
-include $(wildcard .depend/*.dep) -include $(wildcard ${DEPENDDIR}/*.dep)
.PHONY: all options clean doc debug valgrind gdb dist doc install uninstall \ .PHONY: all options clean doc debug valgrind gdb dist doc install uninstall \
test po install-headers uninstall-headers update-po install-manpages \ test po install-headers uninstall-headers update-po install-manpages \

15
doc/man/zathurarc.5.rst
View file

@ -651,6 +651,14 @@ values are "plain", "sqlite" (if built with sqlite support) and "null". If
* Value type: String * Value type: String
* Default value: plain * Default value: plain
dbus-service
^^^^^^^^^^^^^^^^^^^
En/Disables the D-Bus service. If the services is disabled, SyncTeX forward
synchronization is not available.
* Value type: Boolean
* Default value: true
incremental-search incremental-search
^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^
En/Disables incremental search (search while typing). En/Disables incremental search (search while typing).
@ -927,13 +935,6 @@ Defines the command executed for SyncTeX backward synchronization.
* Value type: String * Value type: String
* Default value: * Default value:
syntex-dbus-service
^^^^^^^^^^^^^^^^^^^
En/Disables the D-Bus service required for SyncTeX forward synchronization.
* Value type: Boolean
* Default value: true
index-fg index-fg
^^^^^^^^ ^^^^^^^^
Defines the foreground color of the index mode. Defines the foreground color of the index mode.

2
tests/Makefile
View file

@ -142,6 +142,6 @@ clean:
$(QUIET)rm -rf ${BUILDDIR} $(QUIET)rm -rf ${BUILDDIR}
$(QUIET)rm -rf ${DEPENDDIR} $(QUIET)rm -rf ${DEPENDDIR}
.PHONY: all options clean debug run .PHONY: all clean debug run
-include $(wildcard ${DEPENDDIR}/*.dep) -include $(wildcard ${DEPENDDIR}/*.dep)