From d1153be5942a6e04dcafad167064a7fd5d16055a Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Thu, 25 Nov 2021 19:59:17 +0900 Subject: [PATCH] [build] Move plist rules to root Makefile They are globally useful rather than specific to the vulkan renderer. --- Makefile.am | 11 +++++++++++ libs/video/renderer/Makemodule.am | 11 +---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2187fb642..dbc83cea2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,6 +30,7 @@ AM_CPPFLAGS= -I$(top_srcdir)/include $(PTHREAD_CFLAGS) $(FNM_FLAGS) $(NCURSES_CF common_ldflags= -export-dynamic @PTHREAD_LDFLAGS@ +SUFFICES = TESTS = XFAIL_TESTS = bin_PROGRAMS = @@ -119,6 +120,16 @@ V_XXD_ = $(V_XXD_@AM_DEFAULT_V@) V_XXD_0 = @echo " XXD " $@; V_XXD_1 = +V_SED = $(V_SED_@AM_V@) +V_SED_ = $(V_SED_@AM_DEFAULT_V@) +V_SED_0 = @echo " SED " $@; +V_SED_1 = + +SUFFICES += .plist .plc +.plist.plc: + $(V_SED)sed -e 's/"/\\"/g' -e 's/^/"/' -e 's/$$/\\n"/' $< > $@.t &&\ + $(am__mv) $@.t $@ + %.spv: % @$(mkdir_p) $(builddir)/`dirname $@` $(V_GLSLANG)(((($(GLSLANGVALIDATOR) -V $< -o $@; echo $$? >&3) | sed -e '1d' 1>&2) 3>&1) | (read xs; exit $$xs)) diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am index 9fc6fced0..c5ff6407a 100644 --- a/libs/video/renderer/Makemodule.am +++ b/libs/video/renderer/Makemodule.am @@ -91,20 +91,11 @@ libs_video_renderer_librender_gl_la_SOURCES = \ shader_src= libs/video/renderer/glsl/quakeforge.glsl shader_gen= libs/video/renderer/glsl/quakeforge.slc -V_SED = $(V_SED_@AM_V@) -V_SED_ = $(V_SED_@AM_DEFAULT_V@) -V_SED_0 = @echo " SED " $@; -V_SED_1 = - -SUFFICES=.frag .vert .spv .spvc .fc .vc .slc .glsl .plist .plc +SUFFICES += .frag .vert .spv .spvc .fc .vc .slc .glsl .glsl.slc: $(V_SED)sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@.t &&\ $(am__mv) $@.t $@ -.plist.plc: - $(V_SED)sed -e 's/"/\\"/g' -e 's/^/"/' -e 's/$$/\\n"/' $< > $@.t &&\ - $(am__mv) $@.t $@ - video_renderer_glsl_libs= \ libs/video/renderer/librender_glsl.la \ libs/models/libmodels_glsl.la