diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2018-08-03 05:29:27 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-08-03 05:29:27 +0200 |
| commit | 1f5d779ef859733b75a8f93780ad88da58a4effc (patch) | |
| tree | 3f432f662ada7e81eb4f1c286de870f1f8ec65bb /Makefile.am | |
| parent | ac7d67f43e2b82dcc841ca2ecae91e668eb90613 (diff) | |
Fix systemplate creation when running make with -j.
Change-Id: Ifcf45b01fdba9b502b1a88190d6a0d4cb316c566
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 5b1767bcd..a40bc999a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -254,7 +254,7 @@ clean-local: if test "z@SYSTEMPLATE_PATH@" != "z"; then rm -rf "@SYSTEMPLATE_PATH@"; fi if test "z@TILECACHE_PATH@" != "z"; then rm -rf "@TILECACHE_PATH@"; fi -run: all @TILECACHE_PATH@ @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp +run: all @TILECACHE_PATH@ @JAILS_PATH@ @echo "Launching loolwsd" @fc-cache "@LO_PATH@"/share/fonts/truetype @cp $(abs_top_srcdir)/test/data/hello.odt $(abs_top_srcdir)/test/data/hello-world.odt @@ -268,7 +268,7 @@ run: all @TILECACHE_PATH@ @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp --o:admin_console.username=admin --o:admin_console.password=admin \ --o:logging.file[@enable]=true --o:logging.level=trace -run-valgrind: all @TILECACHE_PATH@ @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp +run-valgrind: all @TILECACHE_PATH@ @JAILS_PATH@ @echo "Launching loolwsd under valgrind (but not forkit/loolkit, yet)" @fc-cache "@LO_PATH@"/share/fonts/truetype @cp $(abs_top_srcdir)/test/data/hello.odt $(abs_top_srcdir)/test/data/hello-world.odt @@ -282,7 +282,7 @@ run-valgrind: all @TILECACHE_PATH@ @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp --o:admin_console.username=admin --o:admin_console.password=admin \ --o:logging.file[@enable]=false --o:logging.level=trace -run-gdb: all @TILECACHE_PATH@ @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp +run-gdb: all @TILECACHE_PATH@ @JAILS_PATH@ @echo "Launching loolwsd under valgrind's callgrind" @fc-cache "@LO_PATH@"/share/fonts/truetype @cp $(abs_top_srcdir)/test/data/hello.odt $(abs_top_srcdir)/test/data/hello-world.odt @@ -297,7 +297,7 @@ run-gdb: all @TILECACHE_PATH@ @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp --o:admin_console.username=admin --o:admin_console.password=admin \ --o:logging.file[@enable]=false --o:logging.level=error -run-callgrind: all @TILECACHE_PATH@ @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp +run-callgrind: all @TILECACHE_PATH@ @JAILS_PATH@ @echo "Launching loolwsd under valgrind's callgrind" @fc-cache "@LO_PATH@"/share/fonts/truetype @cp $(abs_top_srcdir)/test/data/hello.odt $(abs_top_srcdir)/test/data/hello-world.odt @@ -312,7 +312,7 @@ run-callgrind: all @TILECACHE_PATH@ @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp --o:admin_console.username=admin --o:admin_console.password=admin \ --o:logging.file[@enable]=false --o:logging.level=error -run-strace: all @TILECACHE_PATH@ @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp +run-strace: all @TILECACHE_PATH@ @JAILS_PATH@ @echo "Launching loolwsd under strace" @fc-cache "@LO_PATH@"/share/fonts/truetype @cp $(abs_top_srcdir)/test/data/hello.odt $(abs_top_srcdir)/test/data/hello-world.odt |