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

Build: Place Autoconf macros into m4/ directory 

This separates the M4 macros from the other cruft in autostuff/
to prepare for the introduction of custom macro files.
This commit is contained in:
Daniel Elstner 2015-08-22 20:58:11 +02:00
parent cb4d28efd1
commit ea1d535145
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -18,7 +18,7 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>. ## along with this program. If not, see <http://www.gnu.org/licenses/>.
## ##
ACLOCAL_AMFLAGS = -I autostuff ACLOCAL_AMFLAGS = -I m4
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

2
configure.ac
View File

@ -30,7 +30,7 @@ AC_INIT([libsigrok], [sr_package_version_major.sr_package_version_minor.sr_packa
[sigrok-devel@lists.sourceforge.net], [sigrok-devel@lists.sourceforge.net],
[libsigrok], [http://www.sigrok.org]) [libsigrok], [http://www.sigrok.org])
AC_CONFIG_HEADERS([config.h include/libsigrok/version.h]) AC_CONFIG_HEADERS([config.h include/libsigrok/version.h])
AC_CONFIG_MACRO_DIR([autostuff]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([autostuff]) AC_CONFIG_AUX_DIR([autostuff])
# We require at least automake 1.11 (needed for 'silent rules'). # We require at least automake 1.11 (needed for 'silent rules').