Commit 8327a10b authored by Garrett Regier's avatar Garrett Regier

Cleanup resource generation in the plugin loaders

parent db4aec16
......@@ -52,7 +52,7 @@ Makefile.in
/intltool-update.in
/libtool
/ltmain.sh
/loaders/lua5.1/peas-lua-resources.c
/loaders/lua5.1/resources/peas-lua-resources.c
/loaders/python/peas-python-resources.c
/loaders/python3/peas-python3-resources.c
/m4
......
......@@ -17,11 +17,11 @@ loader_LTLIBRARIES = liblua51loader.la
liblua51loader_la_SOURCES = \
peas-lua-internal.c \
peas-lua-internal.h \
peas-lua-resources.c \
peas-plugin-loader-lua.c \
peas-plugin-loader-lua.h \
peas-lua-utils.c \
peas-lua-utils.h
peas-lua-utils.h \
resources/peas-lua-resources.c
liblua51loader_la_LDFLAGS = \
$(LOADER_LIBTOOL_FLAGS) \
......@@ -32,14 +32,5 @@ liblua51loader_la_LIBADD = \
$(PEAS_LIBS) \
$(LUA51_LIBS)
loader_resources_deps = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/resources --generate-dependencies $(srcdir)/resources/peas-lua.gresource.xml)
peas-lua-resources.c: $(srcdir)/resources/peas-lua.gresource.xml $(loader_resources_deps)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --internal --target=$@ --sourcedir=$(srcdir)/resources --generate-source $(srcdir)/resources/peas-lua.gresource.xml
EXTRA_DIST = \
$(loader_resources_deps)
CLEANFILES = peas-lua-resources.c
gcov_sources = $(liblua51loader_la_SOURCES)
include $(top_srcdir)/Makefile.gcov
LUA_FILES = \
peas-lua-internal.lua \
peas-lua-strict.lua
loader_resources_deps = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir="$(srcdir)" --generate-dependencies "$(srcdir)/peas-lua.gresource.xml")
loader_resources_c_deps = $(srcdir)/peas-lua.gresource.xml $(loader_resources_deps)
LUAC_FILES = $(addsuffix c,$(LUA_FILES))
LUAC_FILES = $(addsuffix c,$(loader_resources_deps))
peas-lua-resources.c: $(loader_resources_c_deps)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) \
--target="$@" \
--sourcedir="$(srcdir)" \
--generate-source \
--internal \
"$(srcdir)/peas-lua.gresource.xml"
%.luac: %.lua
$(AM_V_GEN) $(LUA51_BIN) $(srcdir)/peas-lua-compile.lua $< $@
all-local: $(LUAC_FILES)
all-local: $(LUAC_FILES) peas-lua-resources.c
CLEANFILES = \
peas-lua-resources.c \
$(LUAC_FILES)
EXTRA_DIST = \
peas-lua-compile.lua \
peas-lua.gresource.xml \
$(LUA_FILES)
peas-lua-compile.lua \
$(loader_resources_c_deps)
......@@ -38,13 +38,19 @@ peas-python-internal.pyc: peas-python-internal.py
all-local: peas-python-internal.pyc
loader_resources_deps = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/peas-python.gresource.xml)
peas-python-resources.c: $(srcdir)/peas-python.gresource.xml $(loader_resources_deps)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --internal --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/peas-python.gresource.xml
loader_resources_c_deps = $(srcdir)/peas-python.gresource.xml $(loader_resources_deps)
peas-python-resources.c: $(loader_resources_c_deps)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) \
--target="$@" \
--sourcedir="$(srcdir)" \
--generate-source \
--internal \
"$(srcdir)/peas-python.gresource.xml"
EXTRA_DIST = \
peas-python-compile.py \
peas-python.gresource.xml \
$(loader_resources_deps)
$(loader_resources_c_deps)
CLEANFILES = \
peas-python-internal.pyc \
......
......@@ -37,13 +37,18 @@ peas-python3-internal.pyc: $(srcdir)/../python/peas-python-internal.py
all-local: peas-python3-internal.pyc
loader_resources_deps = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/peas-python3.gresource.xml)
peas-python3-resources.c: $(srcdir)/peas-python3.gresource.xml $(loader_resources_deps)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --internal --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/peas-python3.gresource.xml
EXTRA_DIST = \
peas-python3.gresource.xml \
$(loader_resources_deps)
loader_resources_deps = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir="$(srcdir)" --generate-dependencies "$(srcdir)/peas-python3.gresource.xml")
loader_resources_c_deps = $(srcdir)/peas-python3.gresource.xml $(loader_resources_deps)
peas-python3-resources.c: $(loader_resources_c_deps)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) \
--target="$@" \
--sourcedir="$(srcdir)" \
--generate-source \
--internal \
"$(srcdir)/peas-python3.gresource.xml"
EXTRA_DIST = $(loader_resources_c_deps)
CLEANFILES = \
peas-python3-internal.pyc \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment