Skip to content

Commit 7eb86bd

Browse files
committed
autotools: Rename build-aux to autotools-aux
This change improves separation from CMake build directories, which typically use the "build" prefix. Additionally, corresponding `.gitignore` entries have been refactored.
1 parent b6c2a3c commit 7eb86bd

File tree

5 files changed

+7
-18
lines changed

5 files changed

+7
-18
lines changed

.gitignore

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,9 @@ coverage.*.html
4545
*.gcno
4646
*.gcov
4747

48-
build-aux/ar-lib
49-
build-aux/config.guess
50-
build-aux/config.sub
51-
build-aux/depcomp
52-
build-aux/install-sh
53-
build-aux/ltmain.sh
54-
build-aux/m4/libtool.m4
55-
build-aux/m4/lt~obsolete.m4
56-
build-aux/m4/ltoptions.m4
57-
build-aux/m4/ltsugar.m4
58-
build-aux/m4/ltversion.m4
59-
build-aux/missing
60-
build-aux/compile
61-
build-aux/test-driver
48+
/autotools-aux/
49+
!/autotools-aux/m4/bitcoin_secp.m4
50+
6251
libsecp256k1.pc
6352

6453
### CMake

Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ACLOCAL_AMFLAGS = -I build-aux/m4
1+
ACLOCAL_AMFLAGS = -I autotools-aux/m4
22

33
# AM_CFLAGS will be automatically prepended to CFLAGS by Automake when compiling some foo
44
# which does not have an explicit foo_CFLAGS variable set.
File renamed without changes.

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ define(_LIB_VERSION_AGE, 0)
1919

2020
AC_INIT([libsecp256k1],m4_join([.], _PKG_VERSION_MAJOR, _PKG_VERSION_MINOR, _PKG_VERSION_PATCH)m4_if(_PKG_VERSION_IS_RELEASE, [true], [], [-dev]),[https://github.com/bitcoin-core/secp256k1/issues],[libsecp256k1],[https://github.com/bitcoin-core/secp256k1])
2121

22-
AC_CONFIG_AUX_DIR([build-aux])
23-
AC_CONFIG_MACRO_DIR([build-aux/m4])
22+
AC_CONFIG_AUX_DIR([autotools-aux])
23+
AC_CONFIG_MACRO_DIR([autotools-aux/m4])
2424
AC_CANONICAL_HOST
2525

2626
# Require Automake 1.11.2 for AM_PROG_AR

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ set_target_properties(secp256k1_objs PROPERTIES
9595
)
9696

9797
# This emulates Libtool to make sure Libtool and CMake agree on the ABI version,
98-
# see below "Calculate the version variables" in build-aux/ltmain.sh.
98+
# see below "Calculate the version variables" in autotools-aux/ltmain.sh.
9999
math(EXPR ${PROJECT_NAME}_soversion "${${PROJECT_NAME}_LIB_VERSION_CURRENT} - ${${PROJECT_NAME}_LIB_VERSION_AGE}")
100100
set_target_properties(secp256k1 PROPERTIES
101101
SOVERSION ${${PROJECT_NAME}_soversion}

0 commit comments

Comments
 (0)