GNU
/
easejs
1
0
Fork 0
Code Releases Activity

Minor build improvements

master
Mike Gerwitz 2015-12-22 23:06:27 -05:00
parent d4478cdcd1 12adc9954d
commit 2f3639f776
No known key found for this signature in database
GPG Key ID: F22BB8158EE30EAB
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -61,7 +61,7 @@ EXTRA_DIST = AUTHORS NEWS ChangeLog README.md HACKING INSTALL \
.PHONY: mkbuild combine min doc check test test-suite perf FORCE .PHONY: mkbuild combine min doc check test test-suite perf FORCE
default: combine all: combine
mkbuild: $(path_build) mkbuild: $(path_build)

17
configure.ac
View File

@ -90,6 +90,23 @@ AS_IF(test "$JAVA" -a ! "$CCJAR",
AM_CONDITIONAL(HAS_CCJAR, [test "$CCJAR"]) AM_CONDITIONAL(HAS_CCJAR, [test "$CCJAR"])
# dia used for documentation images
path_dia=dia
AC_ARG_WITH([dia],
[AS_HELP_STRING([--without-dia],
[disable support for documentation graphics])],
[],
[with_dia=yes])
AS_IF([test "$with_dia" != no],
[AC_CHECK_PROGS(DIA, [dia])
AS_IF([test "$DIA"],
[],
[AC_MSG_WARN([could not locate dia (--without-dia to disable)])])
])
AM_CONDITIONAL(HAS_DIA, [test "$DIA"])
# check for performance tests # check for performance tests
AC_MSG_CHECKING([for performance tests]) AC_MSG_CHECKING([for performance tests])
PERF_TESTS=$( find $srcdir/test/perf -name 'perf-*.js' | tr '\n' ' ' | LC_ALL=C sort ) PERF_TESTS=$( find $srcdir/test/perf -name 'perf-*.js' | tr '\n' ' ' | LC_ALL=C sort )

14
doc/Makefile.am
View File

@ -59,13 +59,21 @@ pdf-local: img
html-local: img easejs.css highlight.pack.js interactive.js html-local: img easejs.css highlight.pack.js interactive.js
# doc images # doc images
if HAS_DIA
img/%.png: img/%.dia img/%.png: img/%.dia
echo "$<" | grep -q 'wide' \ echo "$<" | grep -q 'wide' \
&& dia -e $@ -s x250 $< \ && $(DIA) -e $@ -s x250 $< \
|| dia -e $@ -s 300x $< || $(DIA) -e $@ -s 300x $<
else
@echo "warning: not building eps (--without-dia)"
endif
img/%.eps: img/%.dia img/%.eps: img/%.dia
dia -e $@ $< if HAS_DIA
$(DIA) -e $@ $<
else
@echo "warning: not building eps (--without-dia)"
endif
# doc plain text # doc plain text
$(path_doc_output_plain): $(doc_imgs_txt) $(path_doc_output_plain): $(doc_imgs_txt)