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

Rename resources

Browse source 
Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
This commit is contained in:
Sebastian Ramacher 2017-07-08 12:19:05 +02:00
parent 66805ec2eb
commit e28598a07d
4 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -9,8 +9,7 @@
*.pyc *.pyc
# generated files # generated files
dbus-interface-definitions.c resources.*
css-definitions.*
zathura.1 zathura.1
zathurarc.5 zathurarc.5

14
Makefile
View file

@ -6,7 +6,7 @@ include common.mk
# source files # source files
OSOURCE = $(sort $(wildcard ${PROJECT}/*.c) \ OSOURCE = $(sort $(wildcard ${PROJECT}/*.c) \
${PROJECT}/css-definitions.c) ${PROJECT}/resources.c)
SOURCE_FILTER = SOURCE_FILTER =
ifneq (${WITH_SQLITE},0) ifneq (${WITH_SQLITE},0)
@ -79,17 +79,17 @@ ${PROJECT}/version.h: ${PROJECT}/version.h.in config.mk
-e 's/ZVABI/${ZATHURA_ABI_VERSION}/' ${PROJECT}/version.h.in > ${PROJECT}/version.h.tmp -e 's/ZVABI/${ZATHURA_ABI_VERSION}/' ${PROJECT}/version.h.in > ${PROJECT}/version.h.tmp
$(QUIET)mv ${PROJECT}/version.h.tmp ${PROJECT}/version.h $(QUIET)mv ${PROJECT}/version.h.tmp ${PROJECT}/version.h
${PROJECT}/css-definitions.%: data/zathura-css.gresource.xml config.mk ${PROJECT}/resources.%: data/zathura.gresource.xml config.mk
$(call colorecho,GEN,$@) $(call colorecho,GEN,$@)
@mkdir -p ${DEPENDDIR}/$(dir $@) @mkdir -p ${DEPENDDIR}/$(dir $@)
$(QUIET)$(GLIB_COMPILE_RESOURCES) --generate --c-name=zathura_css --internal \ $(QUIET)$(GLIB_COMPILE_RESOURCES) --generate --c-name=zathura_resources --internal \
--dependency-file=$(DEPENDDIR)/$@.dep \ --dependency-file=$(DEPENDDIR)/$@.dep \
--sourcedir=data --target=$@ data/zathura-css.gresource.xml --sourcedir=data --target=$@ data/zathura.gresource.xml
# common dependencies # common dependencies
${OBJECTS} ${OBJECTS_DEBUG} ${OBJECTS_GCOV}: config.mk \ ${OBJECTS} ${OBJECTS_DEBUG} ${OBJECTS_GCOV}: config.mk \
${PROJECT}/version.h ${PROJECT}/css-definitions.h \ ${PROJECT}/version.h ${PROJECT}/resources.h \
.version-checks/GIRARA .version-checks/GLIB .version-checks/GTK .version-checks/GIRARA .version-checks/GLIB .version-checks/GTK
# rlease build # rlease build
@ -169,8 +169,8 @@ clean:
${PROJECT}.pc \ ${PROJECT}.pc \
${PROJECT}/version.h \ ${PROJECT}/version.h \
${PROJECT}/version.h.tmp \ ${PROJECT}/version.h.tmp \
${PROJECT}/css-definitions.c \ ${PROJECT}/resources.c \
${PROJECT}/css-definitions.c.tmp \ ${PROJECT}/resources.h \
$(PROJECT).info \ $(PROJECT).info \
gcov \ gcov \
.version-checks .version-checks

0
data/zathura-css.gresource.xml → data/zathura.gresource.xml
View file

4
zathura/zathura.c
View file

@ -41,7 +41,7 @@
#include "plugin.h" #include "plugin.h"
#include "adjustment.h" #include "adjustment.h"
#include "dbus-interface.h" #include "dbus-interface.h"
#include "css-definitions.h" #include "resources.h"
#include "synctex.h" #include "synctex.h"
#include "content-type.h" #include "content-type.h"
@ -251,7 +251,7 @@ init_css(zathura_t* zathura)
g_free(color); g_free(color);
} }
GResource* css_resource = zathura_css_get_resource(); GResource* css_resource = zathura_resources_get_resource();
GBytes* css_data = g_resource_lookup_data(css_resource, GBytes* css_data = g_resource_lookup_data(css_resource,
"/org/pwmt/zathura/CSS/zathura.css_t", "/org/pwmt/zathura/CSS/zathura.css_t",
G_RESOURCE_LOOKUP_FLAGS_NONE, NULL); G_RESOURCE_LOOKUP_FLAGS_NONE, NULL);