Commit 35975d69 authored by Philip Chimento's avatar Philip Chimento 🚮

build: Enable silent rules for generated files

We have several files that must be processed by make-time sed scripts.
Make nicer build logs by using AM_V_GEN to enable silent rules for these.

Also make sure the directories exist before the files are placed into
them. This is usually not a problem, but will bite you on a clean
checkout with builddir != srcdir.

https://bugzilla.gnome.org/show_bug.cgi?id=772027
parent b6f41f0e
......@@ -12,6 +12,7 @@ installedtestmeta_DATA += jsunit.test
endif
jsunit.test: installed-tests/jsunit.test.in Makefile
$(AM_V_GEN)$(MKDIR_P) $(@D) && \
sed -e s,@pkglibexecdir\@,$(pkglibexecdir), < $< > $@.tmp && mv $@.tmp $@
gjsinsttestdir = $(pkglibexecdir)/installed-tests
......@@ -168,7 +169,11 @@ dist_jstests_DATA += installed-tests/js/testCairo.js
endif
%.test: installed-tests/scripts/%.js installed-tests/script.test.in Makefile
sed -e s,@pkglibexecdir\@,$(pkglibexecdir), -e s,@name\@,$(notdir $<), < $(srcdir)/installed-tests/script.test.in > $@.tmp && mv $@.tmp $@
$(AM_V_GEN)$(MKDIR_P) $(@D) && \
sed -e s,@pkglibexecdir\@,$(pkglibexecdir), \
-e s,@name\@,$(notdir $<), \
< $(srcdir)/installed-tests/script.test.in > $@.tmp && \
mv $@.tmp $@
jsscripttestsdir = $(gjsinsttestdir)/scripts
dist_jsscripttests_DATA = installed-tests/scripts/testSystemExit.js
......
......@@ -197,6 +197,7 @@ tapset_in_files = gjs/gjs.stp.in
EXTRA_DIST += $(tapset_in_files)
if ENABLE_SYSTEMTAP
gjs/gjs.stp: gjs/gjs.stp.in Makefile
$(AM_V_GEN)$(MKDIR_P) $(@D) && \
sed -e s,@EXPANDED_LIBDIR@,$(libdir), < $< > $@.tmp && mv $@.tmp $@
tapsetdir = $(DESTDIR)$(datadir)/systemtap/tapset
tapset_DATA = $(tapset_in_files:.stp.in=.stp)
......
......@@ -34,6 +34,9 @@ LT_PREREQ([2.2.0])
# no stupid static libraries
LT_INIT([disable-static])
# Other programs
AC_PROG_MKDIR_P
GNOME_CXX_WARNINGS([maximum])
# coverage
......
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