From 849a760ea03a07140a8222d94d4c074071c6695b Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Sun, 2 May 2021 14:32:32 +0200
Subject: [PATCH] BUILD: Display a custom 'XXD' for files generated with xxd
---
Makefile.in | 6 ++++--
aclocal.m4 | 13 ++++---------
configure | 7 +------
inc/Makefile.in | 2 +-
man/Makefile.in | 2 +-
src/Makefile.am | 34 +++++++++++++++++++++-------------
src/Makefile.in | 22 ++++++++++++++--------
7 files changed, 46 insertions(+), 40 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 896aeaf4..7c5d2146 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
@@ -239,6 +239,8 @@ am__relativize = \
DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
DIST_TARGETS = dist-gzip
+# Exists only to be overridden by the user if desired.
+AM_DISTCHECK_DVI_TARGET = dvi
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -780,7 +782,7 @@ distcheck: dist
$(DISTCHECK_CONFIGURE_FLAGS) \
--srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
+ && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
&& $(MAKE) $(AM_MAKEFLAGS) check \
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
diff --git a/aclocal.m4 b/aclocal.m4
index 66bd109a..eb3ba2b4 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.3 -*- Autoconf -*-
# Copyright (C) 1996-2020 Free Software Foundation, Inc.
@@ -311,7 +311,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.16'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.16.2], [],
+m4_if([$1], [1.16.3], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -327,7 +327,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.2])dnl
+[AM_AUTOMAKE_VERSION([1.16.3])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -1039,12 +1039,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([missing])dnl
if test x"${MISSING+set}" != xset; then
- case $am_aux_dir in
- *\ * | *\ *)
- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
- *)
- MISSING="\${SHELL} $am_aux_dir/missing" ;;
- esac
+ MISSING="\${SHELL} '$am_aux_dir/missing'"
fi
# Use eval to expand $SHELL
if eval "$MISSING --is-lightweight"; then
diff --git a/configure b/configure
index 84f770f6..b52abded 100755
--- a/configure
+++ b/configure
@@ -4744,12 +4744,7 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
if test x"${MISSING+set}" != xset; then
- case $am_aux_dir in
- *\ * | *\ *)
- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
- *)
- MISSING="\${SHELL} $am_aux_dir/missing" ;;
- esac
+ MISSING="\${SHELL} '$am_aux_dir/missing'"
fi
# Use eval to expand $SHELL
if eval "$MISSING --is-lightweight"; then
diff --git a/inc/Makefile.in b/inc/Makefile.in
index 4b0686cb..902f5dac 100644
--- a/inc/Makefile.in
+++ b/inc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
diff --git a/man/Makefile.in b/man/Makefile.in
index fc8e601f..7eb8c575 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
diff --git a/src/Makefile.am b/src/Makefile.am
index 3bc9f02f..94414c68 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,26 @@
AM_CPPFLAGS = -I$(abs_top_srcdir)/inc/ -I$(abs_top_builddir)/inc/
+######################
+## SQL to C strings ##
+######################
+
+XXD_GEN = @echo " XXD "$@;
+
+database/disk.c: database/disk.sql
+ $(XXD_GEN)
+ @echo '__attribute__((unused)) unsigned char ___src_database_disk_sql[] = { ' > $@
+ @$(XXD) -i < $< >> $@
+ @echo ', 0x00 };' >> $@
+
+database/memory.c: database/memory.sql
+ $(XXD_GEN)
+ @echo '__attribute__((unused)) unsigned char ___src_database_memory_sql[] = { ' > $@
+ @$(XXD) -i < $< >> $@
+ @echo ', 0x00 };' >> $@
+
+CLEANFILES = database/disk.c database/memory.c
+EXTRA_DIST = database/disk.sql database/memory.sql
+
###############
## LIBRARIES ##
###############
@@ -56,19 +77,6 @@ if LKT_STATIC_MODULE
liblektor_la_LIBADD = liblktmodsdl.la liblktmodrepo.la
endif
-# Generated with `xxd`
-database/disk.c: database/disk.sql
- @echo '__attribute__((unused)) unsigned char ___src_database_disk_sql[] = { ' > $@
- @$(XXD) -i < $< >> $@
- $(AM_V_GEN) echo ', 0x00 };' >> $@
-database/memory.c: database/memory.sql
- @echo '__attribute__((unused)) unsigned char ___src_database_memory_sql[] = { ' > $@
- @$(XXD) -i < $< >> $@
- $(AM_V_GEN) echo ', 0x00 };' >> $@
-
-CLEANFILES = database/disk.c database/memory.c
-EXTRA_DIST = database/disk.sql database/memory.sql
-
################
## MAIN FILES ##
################
diff --git a/src/Makefile.in b/src/Makefile.in
index bf2ec1ad..bc304b14 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
@@ -571,6 +571,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I$(abs_top_srcdir)/inc/ -I$(abs_top_builddir)/inc/
+######################
+######################
+XXD_GEN = @echo " XXD "$@;
+CLEANFILES = database/disk.c database/memory.c $(am__append_9)
+EXTRA_DIST = database/disk.sql database/memory.sql $(am__append_8)
+
###############
###############
@LKT_STATIC_MODULE_TRUE@noinst_LTLIBRARIES = liblktmodsdl.la liblktmodrepo.la
@@ -605,8 +611,6 @@ liblektor_la_SOURCES = $(LKT_MKV_SOURCES) $(LKT_BASE_SOURCES) $(LKT_DATABASE_SOU
liblektor_la_CFLAGS = -fPIC
liblektor_la_LDFLAGS = -avoid-version -pthread -lsqlite3 -ldl -shared
@LKT_STATIC_MODULE_TRUE@liblektor_la_LIBADD = liblktmodsdl.la liblktmodrepo.la
-CLEANFILES = database/disk.c database/memory.c $(am__append_9)
-EXTRA_DIST = database/disk.sql database/memory.sql $(am__append_8)
lkt_SOURCES = main/lkt.c base/cmd.c base/common.c base/segv.c base/os.c
lkt_LDFLAGS = -pthread -ldl -static
luka_SOURCES = main/luka.c base/config.c base/cmd.c base/common.c base/segv.c base/reg.c base/os.c
@@ -1472,7 +1476,8 @@ installdirs:
done
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-am
-install-exec: install-exec-am
+install-exec: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-exec-am
install-data: install-data-am
uninstall: uninstall-am
@@ -1685,7 +1690,7 @@ ps-am:
uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES
-.MAKE: all check install install-am install-strip
+.MAKE: all check install install-am install-exec install-strip
.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
@@ -1707,15 +1712,16 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES
.PRECIOUS: Makefile
-# Generated with `xxd`
database/disk.c: database/disk.sql
+ $(XXD_GEN)
@echo '__attribute__((unused)) unsigned char ___src_database_disk_sql[] = { ' > $@
@$(XXD) -i < $< >> $@
- $(AM_V_GEN) echo ', 0x00 };' >> $@
+ @echo ', 0x00 };' >> $@
database/memory.c: database/memory.sql
+ $(XXD_GEN)
@echo '__attribute__((unused)) unsigned char ___src_database_memory_sql[] = { ' > $@
@$(XXD) -i < $< >> $@
- $(AM_V_GEN) echo ', 0x00 };' >> $@
+ @echo ', 0x00 };' >> $@
@LKT_KLKT_TRUE@ # ------------- #
@LKT_KLKT_TRUE@ # DOCUMENTATION #
--
GitLab