From 52dd70354718b2693a9ad239ef082f87abe5b39e Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Wed, 22 Mar 2023 20:30:45 -0400 Subject: build: Rename binary to "atsign" Fixes: gcc: error: @-file refers to a directory --- diff --git a/.gitignore b/.gitignore index cd341c2..0084077 100644 --- a/.gitignore +++ b/.gitignore @@ -28,7 +28,7 @@ Makefile .dirstamp *.o /version.c -/@ +/atsign /test-suite.log /atsign-*.tar* /atsign-*/ diff --git a/Makefile.am b/Makefile.am index 5f74a02..c08fb30 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,23 +40,23 @@ endif # * Our release target PACKAGE_STRING = $(PACKAGE_NAME) $(PACKAGE_VERSION)$(PACKAGE_VERSION_GIT) -bin_PROGRAMS = @ +bin_PROGRAMS = atsign -@_SOURCES = -@_CFLAGS = \ +atsign_SOURCES = +atsign_CFLAGS = \ $(WARN_CFLAGS) \ $(ASAN_CFLAGS) -@_CPPFLAGS = \ +atsign_CPPFLAGS = \ $(SDL_CFLAGS) \ $(SDL_TTF_CFLAGS) \ -DABS_BUILDDIR=\"$(abs_builddir)\" \ -DFONTSDIR=\"$(fontsdir)\" -@_LDADD = \ +atsign_LDADD = \ $(ASAN_CFLAGS) \ $(SDL_LIBS) \ $(SDL_TTF_LIBS) -@_LINK = $(LINK) version.c -EXTRA_@_DEPENDENCIES = version.c +atsign_LINK = $(LINK) version.c +EXTRA_atsign_DEPENDENCIES = version.c CLEANFILES = version.c CONFIG_CLEAN_FILES = EXTRA_DIST = autogen.sh FORMATS @@ -66,7 +66,7 @@ V_REDIR_ = $(V_REDIR_$(AM_DEFAULT_VERBOSITY)) V_REDIR_0 = 1>/dev/null 2>&1 V_REDIR_1 = -version.c: $(@_OBJECTS) $(@_DEPENDENCIES) +version.c: $(atsign_OBJECTS) $(atsign_DEPENDENCIES) $(AM_V_GEN)printf 'const char *PACKAGE_VERSION_GIT = "%s";\n' \ "$(PACKAGE_VERSION_GIT)" >version.c @@ -92,7 +92,7 @@ if CROSS_COMPILING exit 1; \ fi else !CROSS_COMPILING - $(srcdir)/@ -d '1969-12-31 19:00:01' -F 1>FORMATS + $(srcdir)/atsign -d '1969-12-31 19:00:01' -F 1>FORMATS endif !CROSS_COMPILING else !ENABLE_TESTS if ! [ -f 'FORMATS' ]; then \ diff --git a/src/local.mk b/src/local.mk index 9992269..3ce2029 100644 --- a/src/local.mk +++ b/src/local.mk @@ -1,4 +1,4 @@ -@_SOURCES += \ +atsign_SOURCES += \ %reldir%/datetime.c \ %reldir%/datetime.h \ %reldir%/formats.h \ diff --git a/tests/formats.sh b/tests/formats.sh index a0c4188..576b96a 100755 --- a/tests/formats.sh +++ b/tests/formats.sh @@ -24,7 +24,7 @@ set -eu plan_ 1 exp="$(cat "${0%.sh}.exp")" -got="$("${TOP_BUILDDIR}/@" -d '1970-01-02 03:04:05' -F)" +got="$("${TOP_BUILDDIR}/atsign" -d '1970-01-02 03:04:05' -F)" if [ x"${got}" = x"${exp}" ]; then ok_ -- 'formats list' diff --git a/tests/parse.sh b/tests/parse.sh index 9113cc6..eadd2cf 100755 --- a/tests/parse.sh +++ b/tests/parse.sh @@ -24,7 +24,7 @@ set -eu now='1969-12-31 23:59:30' tgt='1970-01-01 00:00:00' -fmts="$(TZ=UTC0 "${TOP_BUILDDIR}/@" -d "${tgt}" -F)" +fmts="$(TZ=UTC0 "${TOP_BUILDDIR}/atsign" -d "${tgt}" -F)" time_fmts="$(printf '%s\n' "${fmts}" | \ sed -n '/^Time formats:$/,/^Date formats:$/s/^ \* //p')" date_fmts="$(printf '%s\n' "${fmts}" | \ @@ -54,7 +54,7 @@ test_fmt() fmt="${3}" shift 3 - got="$(TZ=UTC0 "${TOP_BUILDDIR}/@" -d "${now}" "${fmt}" 2>&1)" || : + got="$(TZ=UTC0 "${TOP_BUILDDIR}/atsign" -d "${now}" "${fmt}" 2>&1)" || : if [ x"${got}" = x"${tgt}" ]; then ok_ -- "${fmt}" else -- cgit v0.9.1