bin_PROGRAMS = slotifier
noinst_HEADERS = common/src/help.h common/src/xtra.h
-slotifier_SOURCES = src/slotifier.c src/options.h common/src/help.c
-slotifier_LDADD = $(LIBGERBV_LIBS) $(CNEARTREE_LIBS) libgnu.a \
- $(LTLIBICONV) $(LTLIBINTL) $(HYPOT_LIBM)
+slotifier_SOURCES = src/options.h common/src/help.c
+EXTRA_slotifier_DEPENDENCIES = $(libslotifiermain_a_OBJECTS)
+slotifier_LDADD = $(EXTRA_slotifier_DEPENDENCIES) \
+ $(LIBGERBV_LIBS) $(CNEARTREE_LIBS) libgnu.a \
+ $(LTLIBINTL) $(HYPOT_LIBM)
$(slotifier_OBJECTS): $(gnulib_headers)
-$(slotifier_OBJECTS): src/options.h
+
+if USE_NLS
+slotifier_SOURCES += common/src/copysym.c
+endif
+
+EXTRA_LIBRARIES += libslotifiermain.a
+libslotifiermain_a_SOURCES = src/slotifier.c
+$(libslotifiermain_a_OBJECTS): $(gnulib_headers) src/options.h
dist_man_MANS = doc/slotifier.1
#!/bin/sh
#
-# Copyright © 2011-2012, 2021 Nick Bowler
+# Copyright © 2011-2012, 2015, 2021-2023 Nick Bowler
#
# Simple script to get started from a fresh git checkout.
#
$GIT submodule update --init || err "Failed to update submodules from git."
if test -x $GNULIB/gnulib-tool; then
- $GNULIB/gnulib-tool --update -S || die "Failed to update Gnulib."
+ $GNULIB/gnulib-tool --update -S || die "Failed to update Gnulib."
+ $GNULIB/gnulib-tool --copy-file -S build-aux/config.rpath config.rpath
else
err "Gnulib sources are not properly installed in $GNULIB/"
cat >&2 <<'EOF'
exit 1
fi
-$PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in ||
- die "Failed to fixup Gnulib makefile fragment."
+$PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in \
+ || die "Failed to fixup Gnulib makefile fragment."
# Rewrite if ! ... construts produced by gnulib conditional dependencies
# as these fail in heirloom-sh.
-Subproject commit e599119f0492b01f1f21a8cce8d695c314dab3b1
+Subproject commit 207d0dbfbbfa7ad70b59ada3a741895842958885
-dnl Copyright © 2018-2019, 2021-2022 Nick Bowler
+dnl Copyright © 2018-2019, 2021-2023 Nick Bowler
dnl
dnl License WTFPL2: Do What The Fuck You Want To Public License, version 2.
dnl This is free software: you are free to do what the fuck you want to.
m4_newline([DX_LIB_PKGCONFIG_BLURB([libgerbv])])
])])
+AM_CONDITIONAL([USE_NLS], [test x"$USE_NLS" = x"yes"])
+
AC_CONFIG_TESTDIR([.])
DX_PROG_AUTOTEST
AM_CONDITIONAL([HAVE_AUTOTEST], [test x"$dx_cv_autotest_works" = x"yes"])
# gitlog-to-changelog \
# hypot \
# localcharset \
-# mbswidth \
-# striconv
+# mbswidth
# Specification in the form of a few gnulib-tool.m4 macro invocations:
gl_LOCAL_DIR([])
hypot
localcharset
mbswidth
- striconv
])
gl_AVOID([std-gnu11])
gl_SOURCE_BASE([lib])
#include <gettext.h>
#include <localcharset.h>
#include <mbswidth.h>
-#include <striconv.h>
#include <CNearTree.h>
#include <gerbv.h>
#include "options.h"
#include "help.h"
#include "xtra.h"
+#include "copysym.h"
#if !ENABLE_NLS
# undef ENABLE_NLS
static void print_version(void)
{
- const char *copysign = "(C)";
- void *convsign = NULL;
+ const char *copysign = copyright_symbol(locale_charset());
puts(PACKAGE_STRING);
-
- if (ENABLE_NLS) {
- convsign = str_iconv("\xc2\xa9", "UTF-8", locale_charset());
- if (convsign)
- copysign = convsign;
- }
-
printf("Copyright %s 2023 Nick Bowler.\n", copysign);
puts("License GPLv3+: GNU GPL version 3 or any later version.");
puts("This is free software: you are free to change and redistribute it.");
puts("There is NO WARRANTY, to the extent permitted by law.");
-
- free(convsign);
}
static void print_usage(FILE *f)