BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Build: Reduce unnecessary config substitutions 

Variable substitutions with a constant value may as well be
set directly in Makefile.am.
This commit is contained in:
Daniel Elstner 2015-08-24 22:20:30 +02:00
parent bc8ff24de6
commit ba1c29dc22
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -19,6 +19,10 @@
## ##
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
AM_LIBTOOLFLAGS = --silent
MAKEFLAGS = --no-print-directory
FIRMWARE_DIR = $(datadir)/sigrok-firmware
local_includes = -Iinclude -I$(srcdir)/include -I$(srcdir)/src -I. local_includes = -Iinclude -I$(srcdir)/include -I$(srcdir)/src -I.
if BINDINGS_CXX if BINDINGS_CXX

4
configure.ac
View File

@ -412,10 +412,6 @@ AC_DEFINE_UNQUOTED([CONF_LIBZIP_VERSION], ["$sr_libzip_version"],
AC_DEFINE_UNQUOTED([CONF_HOST], ["$host"], AC_DEFINE_UNQUOTED([CONF_HOST], ["$host"],
[The canonical host libsigrok will run on.]) [The canonical host libsigrok will run on.])
AC_SUBST([FIRMWARE_DIR], ['$(datadir)/sigrok-firmware'])
AC_SUBST([MAKEFLAGS], ['--no-print-directory'])
AC_SUBST([AM_LIBTOOLFLAGS], ['--silent'])
AC_CONFIG_FILES([Makefile libsigrok.pc bindings/cxx/libsigrokcxx.pc]) AC_CONFIG_FILES([Makefile libsigrok.pc bindings/cxx/libsigrokcxx.pc])
AC_OUTPUT AC_OUTPUT