Skip to content

Rename build/ to m4/ #9916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bneradt merged 8 commits into from
Jul 1, 2023
Merged

Rename build/ to m4/ #9916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4020a14
Rename build/ to m4/
JosiahWI Jun 26, 2023
103eb8a
Add build/ to .gitignore
JosiahWI Jun 26, 2023
4df596b
Ignore m4/ in RAT instead of build/
JosiahWI Jun 26, 2023
482b6e4
Update README to reflect build -> m4 change
JosiahWI Jun 27, 2023
db42426
Remove tcmalloc.m4 that was accidentally added
JosiahWI Jun 27, 2023
864c487
Move .mk files from m4/ to mk/
JosiahWI Jun 28, 2023
d886d63
Add mk directory to project tree in README.md
JosiahWI Jun 28, 2023
3c86c2e
Remove BUILD from .gitignore
JosiahWI Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,15 @@ Makefile.in
/tags
/_build

build/_aux/
build/libtool.m4
build/ltoptions.m4
build/ltsugar.m4
build/ltversion.m4
build/lt~obsolete.m4

BUILD
m4/_aux/
m4/libtool.m4
m4/ltoptions.m4
m4/ltsugar.m4
m4/ltversion.m4
m4/lt~obsolete.m4

# common directory name for out-of-tree CMake builds
build

Makefile
Makefile-pl
Expand Down
2 changes: 1 addition & 1 deletion Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

# Local Macros
# http://www.gnu.org/software/automake/manual/automake.html#Local-Macros
ACLOCAL_AMFLAGS = -I build
ACLOCAL_AMFLAGS = -I m4

export CCACHE_BASEDIR

Expand Down
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ plugins to build large scale web applications.
## DIRECTORY STRUCTURE
```
trafficserver ............. Top src dir
├── build ................. Custom macros for configure.ac
├── ci .................... Quality assurance and other CI tools and configs
├── configs ............... Configurations
├── contrib ............... Various contributed auxiliary pieces
Expand All @@ -45,6 +44,8 @@ trafficserver ............. Top src dir
├── lib ...................
│ ├── records ........... Library for config files
│ └── yamlcpp ........... Library for YAML of C++
├── m4 .................... Custom macros for configure.ac
Comment thread
JosiahWI marked this conversation as resolved.
├── mk .................... Includes for Makefiles
├── mgmt .................. JSONRPC server/management and tools
├── plugins ............... Stable core plugins
│ └── experimental ...... Experimental core plugins
Expand Down
2 changes: 1 addition & 1 deletion ci/rat-regex.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
^BUILDS$
^autom4te\.cache$
^build$
^m4$
Copy link
Copy Markdown
Contributor

@cmcfarlen cmcfarlen Jun 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want rat to check our m4 files? I wonder if this line should just be removed? @bneradt do you have any input?

Copy link
Copy Markdown
Contributor Author

@JosiahWI JosiahWI Jun 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RAT checks our CMake scripts. This seems like an analogous case for automake. Just my two cents.

Copy link
Copy Markdown
Contributor

@bneradt bneradt Jun 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably good to check them. Let's do that as a separate PR though in case something goes wrong or we change our mind so it would be easy to revert.

^build-aux$
^body_factory$
^config\.log$
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ m4_define([TS_VERSION_N],[10000000])

AC_INIT([Apache Traffic Server],[TS_VERSION_S()],[dev@trafficserver.apache.org],[trafficserver],[https://trafficserver.apache.org])
AC_PREREQ([2.69])
AC_CONFIG_AUX_DIR([build/_aux])
AC_CONFIG_AUX_DIR([m4/_aux])
AC_CONFIG_SRCDIR([src/traffic_server/traffic_server.cc])
AC_CONFIG_MACRO_DIR([build])
AC_CONFIG_MACRO_DIR([m4])

# NOTE: we turn off portability warnings because the clang-tidy targets use
# GNU make extensions to filter the sources list.
Expand Down
4 changes: 2 additions & 2 deletions example/plugins/c-api/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

include $(top_srcdir)/build/plugins.mk
include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/plugins.mk
include $(top_srcdir)/mk/tidy.mk

AM_CXXFLAGS += -Wno-unused-variable
AM_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
Expand Down
4 changes: 2 additions & 2 deletions example/plugins/cpp-api/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

include $(top_srcdir)/build/plugins.mk
include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/plugins.mk
include $(top_srcdir)/mk/tidy.mk

AM_CXXFLAGS += -Wno-unused-variable
AM_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
Expand Down
2 changes: 1 addition & 1 deletion iocore/aio/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ test_AIO_LDADD = \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
@SWOC_LIBS@ @HWLOC_LIBS@ @YAMLCPP_LIBS@

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

clang-tidy-local: $(DIST_SOURCES)
$(CXX_Clang_Tidy)
2 changes: 1 addition & 1 deletion iocore/cache/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ test_Update_header_SOURCES = \
$(test_main_SOURCES) \
./test/test_Update_header.cc

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

clang-tidy-local: $(DIST_SOURCES)
$(CXX_Clang_Tidy)
2 changes: 1 addition & 1 deletion iocore/dns/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ libinkdns_a_SOURCES = \
# test_I_DNS.cc \
# test_P_DNS.cc

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

clang-tidy-local: $(DIST_SOURCES)
$(CXX_Clang_Tidy)
2 changes: 1 addition & 1 deletion iocore/eventsystem/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ benchmark_ProxyAllocator_CPPFLAGS = $(test_CPP_FLAGS)
benchmark_ProxyAllocator_LDFLAGS = $(test_LD_FLAGS)
benchmark_ProxyAllocator_LDADD = $(test_LD_ADD)

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

clang-tidy-local: $(DIST_SOURCES)
$(CXX_Clang_Tidy)
2 changes: 1 addition & 1 deletion iocore/hostdb/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ test_HostFile_SOURCES = \
HostFile.cc \
HostDBInfo.cc

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

clang-tidy-local: $(DIST_SOURCES)
$(CXX_Clang_Tidy)
2 changes: 1 addition & 1 deletion iocore/net/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ libinknet_a_SOURCES += \
P_NetVCTest.h
endif

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

clang-tidy-local: $(DIST_SOURCES)
$(CXX_Clang_Tidy)
2 changes: 1 addition & 1 deletion iocore/net/quic/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ TESTS = $(check_PROGRAMS)
#
# clang-tidy
#
include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

clang-tidy-local: $(DIST_SOURCES)
$(CXX_Clang_Tidy)
2 changes: 1 addition & 1 deletion iocore/utils/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ libinkutils_a_SOURCES = \
OneWayMultiTunnel.cc \
OneWayTunnel.cc

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

clang-tidy-local: $(DIST_SOURCES)
$(CXX_Clang_Tidy)
2 changes: 1 addition & 1 deletion lib/fastlz/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

AM_CPPFLAGS += -I$(abs_top_srcdir)/lib/fastlz

Expand Down
0 build/atomic.m4 → m4/atomic.m4
View file
Open in desktop
File renamed without changes.
0 build/ax_cc_for_build.m4 → m4/ax_cc_for_build.m4
View file
Open in desktop
File renamed without changes.
0 build/ax_check_openssl.m4 → m4/ax_check_openssl.m4
View file
Open in desktop
File renamed without changes.
0 build/ax_compare_version.m4 → m4/ax_compare_version.m4
View file
Open in desktop
File renamed without changes.
0 build/ax_compiler_vendor.m4 → m4/ax_compiler_vendor.m4
View file
Open in desktop
File renamed without changes.
0 build/ax_lib_curl.m4 → m4/ax_lib_curl.m4
View file
Open in desktop
File renamed without changes.
0 build/ax_path_generic.m4 → m4/ax_path_generic.m4
View file
Open in desktop
File renamed without changes.
0 build/ax_perl_modules.m4 → m4/ax_perl_modules.m4
View file
Open in desktop
File renamed without changes.
0 build/ax_require_defined.m4 → m4/ax_require_defined.m4
View file
Open in desktop
File renamed without changes.
0 build/ax_with_curses.m4 → m4/ax_with_curses.m4
View file
Open in desktop
File renamed without changes.
0 build/brotli.m4 → m4/brotli.m4
View file
Open in desktop
File renamed without changes.
0 build/cjose.m4 → m4/cjose.m4
View file
Open in desktop
File renamed without changes.
0 build/common.m4 → m4/common.m4
View file
Open in desktop
File renamed without changes.
0 build/crypto.m4 → m4/crypto.m4
View file
Open in desktop
File renamed without changes.
0 build/hiredis.m4 → m4/hiredis.m4
View file
Open in desktop
File renamed without changes.
0 build/jansson.m4 → m4/jansson.m4
View file
Open in desktop
File renamed without changes.
0 build/jemalloc.m4 → m4/jemalloc.m4
View file
Open in desktop
File renamed without changes.
0 build/libswoc.m4 → m4/libswoc.m4
View file
Open in desktop
File renamed without changes.
0 build/luajit.m4 → m4/luajit.m4
View file
Open in desktop
File renamed without changes.
0 build/lzma.m4 → m4/lzma.m4
View file
Open in desktop
File renamed without changes.
0 build/mimalloc.m4 → m4/mimalloc.m4
View file
Open in desktop
File renamed without changes.
0 build/network.m4 → m4/network.m4
View file
Open in desktop
File renamed without changes.
0 build/nuraft.m4 → m4/nuraft.m4
View file
Open in desktop
File renamed without changes.
0 build/pcre.m4 → m4/pcre.m4
View file
Open in desktop
File renamed without changes.
0 build/pkg.m4 → m4/pkg.m4
View file
Open in desktop
File renamed without changes.
0 build/quiche.m4 → m4/quiche.m4
View file
Open in desktop
File renamed without changes.
0 build/yaml-cpp.m4 → m4/yaml-cpp.m4
View file
Open in desktop
File renamed without changes.
0 build/zlib.m4 → m4/zlib.m4
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion mgmt/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ AM_CPPFLAGS += \
@YAMLCPP_INCLUDES@ \
$(TS_INCLUDES)

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

clang-tidy-local: $(DIST_SOURCES)
$(CXX_Clang_Tidy)
2 changes: 1 addition & 1 deletion mgmt/api/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

SUBDIRS = include

Expand Down
2 changes: 1 addition & 1 deletion mgmt/config/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ libconfigmanager_la_LIBADD = \
$(top_builddir)/src/tscore/libtscore.la


include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

clang-tidy-local: $(DIST_SOURCES)
$(CXX_Clang_Tidy)
Expand Down
2 changes: 1 addition & 1 deletion mgmt/rpc/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ $(shared_overridable_txn_vars_SOURCES):
$(shared_rpc_ipc_client_SOURCES):
echo "#include \"$(top_builddir)/src/shared/rpc/$@\"" >$@

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

clang-tidy-local: $(DIST_SOURCES)
$(CXX_Clang_Tidy)
Expand Down
2 changes: 1 addition & 1 deletion mgmt/utils/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ test_mgmt_utils_LDADD = \
$(top_builddir)/src/tscore/libtscore.la \
@SWOC_LIBS@

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

clang-tidy-local: $(DIST_SOURCES)
$(CXX_Clang_Tidy)
0 build/plugins.mk → mk/plugins.mk
View file
Open in desktop
File renamed without changes.
0 build/tidy.mk → mk/tidy.mk
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions plugins/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

# Add new plugins in alphabetic order, but keep experimental always at the bottom.

include $(top_srcdir)/build/plugins.mk
include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/plugins.mk
include $(top_srcdir)/mk/tidy.mk

check_PROGRAMS =
noinst_LTLIBRARIES =
Expand Down
2 changes: 1 addition & 1 deletion proxy/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

include private/Makefile.inc

Expand Down
2 changes: 1 addition & 1 deletion proxy/hdrs/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

AM_CPPFLAGS += \
$(iocore_include_dirs) \
Expand Down
2 changes: 1 addition & 1 deletion proxy/http/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

SUBDIRS = remap

Expand Down
2 changes: 1 addition & 1 deletion proxy/http/remap/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

AM_CPPFLAGS += \
$(iocore_include_dirs) \
Expand Down
2 changes: 1 addition & 1 deletion proxy/http2/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

AM_CPPFLAGS += \
$(iocore_include_dirs) \
Expand Down
2 changes: 1 addition & 1 deletion proxy/http3/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ test_qpack_SOURCES = \
#
# clang-tidy
#
include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

clang-tidy-local: $(libhttp3_a_SOURCES) \
$(CXX_Clang_Tidy)
2 changes: 1 addition & 1 deletion proxy/logging/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

AM_CPPFLAGS += \
$(iocore_include_dirs) \
Expand Down
2 changes: 1 addition & 1 deletion proxy/shared/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

# Note that hdrs is targeted from ../Makefile.am
noinst_LIBRARIES = \
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

bin_PROGRAMS =
check_PROGRAMS =
Expand Down
2 changes: 1 addition & 1 deletion src/records/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

check_PROGRAMS = test_librecords test_librecords_on_eventsystem

Expand Down
2 changes: 1 addition & 1 deletion src/tscore/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

noinst_PROGRAMS = CompileParseRules freelist_benchmark benchmark_shared_mutex
check_PROGRAMS = test_geometry test_X509HostnameValidator test_tscore
Expand Down
2 changes: 1 addition & 1 deletion src/tscpp/api/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

lib_LTLIBRARIES = libtscppapi.la

Expand Down
2 changes: 1 addition & 1 deletion src/tscpp/util/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

check_PROGRAMS = test_tscpputil

Expand Down
2 changes: 1 addition & 1 deletion src/wccp/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/tidy.mk

AM_CPPFLAGS += \
-I$(abs_top_srcdir)/include \
Expand Down
4 changes: 2 additions & 2 deletions tests/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

include $(top_srcdir)/build/plugins.mk
include $(top_srcdir)/build/tidy.mk
include $(top_srcdir)/mk/plugins.mk
include $(top_srcdir)/mk/tidy.mk

noinst_LTLIBRARIES =
noinst_PROGRAMS =
Expand Down