From b80e4921334bfe06eb3ac3a9ea0912e06c6ad31e Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Sat, 13 Apr 2024 18:19:18 +0200 Subject: [PATCH] Changes for deployment --- Makefile.am | 23 +++++++++-------------- common/Makefile.am | 13 ++++++------- configure.ac | 2 +- include/Makefile.am | 14 ++++++-------- libcthreads/Makefile.am | 14 ++++++-------- m4/libcerror.m4 | 4 ++-- manuals/Makefile.am | 6 ++---- msvscpp/Makefile.am | 6 ++---- synclibs.sh | 10 ++-------- tests/Makefile.am | 10 ++++------ tests/test_library.sh | 9 +++------ tests/test_manpage.sh | 9 +++------ 12 files changed, 46 insertions(+), 74 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3933b09..8984080 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,8 +38,15 @@ EXTRA_DIST = \ $(PKGCONFIG_FILES) \ $(SPEC_FILES) -MAINTAINERCLEANFILES = \ - Makefile.in +DISTCLEANFILES = \ + Makefile \ + config.status \ + config.cache \ + config.log \ + libcthreads.pc \ + libcthreads.spec \ + Makefile.in \ + po/Makevars pkgconfigdir = $(libdir)/pkgconfig @@ -57,15 +64,3 @@ library: cd $(srcdir)/libcthreads && $(MAKE) $(AM_MAKEFLAGS) cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS) -distclean: clean - -rm -f Makefile - -rm -f config.status - -rm -f config.cache - -rm -f config.log - -rm -f libcthreads.pc - -rm -f libcthreads.spec - @for dir in ${subdirs}; do \ - (cd $$dir && $(MAKE) distclean) \ - || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" - diff --git a/common/Makefile.am b/common/Makefile.am index 2433a75..f7aa524 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -1,4 +1,5 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include +AM_CPPFLAGS = \ + -I../include -I$(top_srcdir)/include EXTRA_DIST = \ byte_stream.h \ @@ -15,11 +16,9 @@ EXTRA_DIST = \ types.h.in \ wide_string.h -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + config.h \ + types.h \ + Makefile \ Makefile.in -distclean: clean - -rm -f config.h - -rm -f types.h - -rm -f Makefile - diff --git a/configure.ac b/configure.ac index 1e24ccc..0b2fa4a 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.71]) AC_INIT( [libcthreads], - [20240319], + [20240413], [joachim.metz@gmail.com]) AC_CONFIG_SRCDIR( diff --git a/include/Makefile.am b/include/Makefile.am index 0408299..6ca1e96 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -14,13 +14,11 @@ EXTRA_DIST = \ libcthreads/features.h.in \ libcthreads/types.h.in -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + libcthreads.h \ + libcthreads/definitions.h \ + libcthreads/features.h \ + libcthreads/types.h \ + Makefile \ Makefile.in -distclean: clean - -rm -f libcthreads.h - -rm -f libcthreads/definitions.h - -rm -f libcthreads/features.h - -rm -f libcthreads/types.h - -rm -f Makefile - diff --git a/libcthreads/Makefile.am b/libcthreads/Makefile.am index 84dbe56..e83995c 100644 --- a/libcthreads/Makefile.am +++ b/libcthreads/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/common \ + -I../include -I$(top_srcdir)/include \ + -I../common -I$(top_srcdir)/common \ @LIBCERROR_CPPFLAGS@ \ @PTHREAD_CPPFLAGS@ \ @LIBCTHREADS_DLL_EXPORT@ @@ -37,14 +37,12 @@ EXTRA_DIST = \ libcthreads.rc \ libcthreads.rc.in -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + libcthreads_definitions.h \ + libcthreads.rc \ + Makefile \ Makefile.in -distclean: clean - -rm -f libcthreads_definitions.h - -rm -f libcthreads.rc - -rm -f Makefile - sources-local: $(BUILT_SOURCES) splint-local: diff --git a/m4/libcerror.m4 b/m4/libcerror.m4 index 87af3e1..e9abcdb 100644 --- a/m4/libcerror.m4 +++ b/m4/libcerror.m4 @@ -1,6 +1,6 @@ dnl Checks for libcerror required headers and functions dnl -dnl Version: 20240314 +dnl Version: 20240413 dnl Function to detect if libcerror is available dnl ac_libcerror_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l arguments @@ -169,7 +169,7 @@ AC_DEFUN([AX_LIBCERROR_CHECK_LOCAL], ]) ]) - ac_cv_libcerror_CPPFLAGS="-I../libcerror"; + ac_cv_libcerror_CPPFLAGS="-I../libcerror -I\$(top_srcdir)/libcerror"; ac_cv_libcerror_LIBADD="../libcerror/libcerror.la"; ac_cv_libcerror=local diff --git a/manuals/Makefile.am b/manuals/Makefile.am index 62a463e..9e7f47b 100644 --- a/manuals/Makefile.am +++ b/manuals/Makefile.am @@ -4,9 +4,7 @@ man_MANS = \ EXTRA_DIST = \ libcthreads.3 -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + Makefile \ Makefile.in -distclean: clean - -rm -f Makefile - diff --git a/msvscpp/Makefile.am b/msvscpp/Makefile.am index e18b877..ba1c7b1 100644 --- a/msvscpp/Makefile.am +++ b/msvscpp/Makefile.am @@ -17,9 +17,7 @@ MSVSCPP_FILES = \ EXTRA_DIST = \ $(MSVSCPP_FILES) -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + Makefile \ Makefile.in -distclean: clean - -rm -f Makefile - diff --git a/synclibs.sh b/synclibs.sh index f169304..f774fbe 100755 --- a/synclibs.sh +++ b/synclibs.sh @@ -1,7 +1,7 @@ #!/bin/sh # Script that synchronizes the local library dependencies # -# Version: 20231023 +# Version: 20240413 EXIT_SUCCESS=0; EXIT_FAILURE=1; @@ -93,12 +93,6 @@ endif i\\ endif d -} - -/distclean: clean/ { - n - N - d }"; echo "${SED_SCRIPT}" >> ${LOCAL_LIB}-$$.sed; sed -i'~' -f ${LOCAL_LIB}-$$.sed ${LOCAL_LIB_MAKEFILE_AM}; @@ -140,7 +134,7 @@ SED_SCRIPT="/^$/ { then if ! test -f "m4/libuna.m4"; then - sed -i'~' 's?@LIBUNA_CPPFLAGS@?-I$(top_srcdir)/libuna?' ${LOCAL_LIB_MAKEFILE_AM}; + sed -i'~' 's?@LIBUNA_CPPFLAGS@?-I../libuna -I$(top_srcdir)/libuna?' ${LOCAL_LIB_MAKEFILE_AM}; fi fi diff --git a/tests/Makefile.am b/tests/Makefile.am index f19a038..223f396 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/common \ + -I../include -I$(top_srcdir)/include \ + -I../include -I$(top_srcdir)/common \ @LIBCERROR_CPPFLAGS@ \ @PTHREAD_CPPFLAGS@ \ @LIBCTHREADS_DLL_IMPORT@ @@ -155,9 +155,7 @@ cthreads_test_thread_pool_LDADD = \ ../libcthreads/libcthreads.la \ @LIBCERROR_LIBADD@ -MAINTAINERCLEANFILES = \ +DISTCLEANFILES = \ + Makefile \ Makefile.in -distclean: clean - -rm -f Makefile - diff --git a/tests/test_library.sh b/tests/test_library.sh index dd215d4..c43c79f 100755 --- a/tests/test_library.sh +++ b/tests/test_library.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Tests library functions and types. # -# Version: 20231007 +# Version: 20240413 EXIT_SUCCESS=0; EXIT_FAILURE=1; @@ -141,12 +141,9 @@ then exit ${EXIT_IGNORE}; fi -TEST_RUNNER="tests/test_runner.sh"; +TEST_DIRECTORY=`dirname $0`; -if ! test -f "${TEST_RUNNER}"; -then - TEST_RUNNER="./test_runner.sh"; -fi +TEST_RUNNER="${TEST_DIRECTORY}/test_runner.sh"; if ! test -f "${TEST_RUNNER}"; then diff --git a/tests/test_manpage.sh b/tests/test_manpage.sh index 4abb656..b5fafd7 100755 --- a/tests/test_manpage.sh +++ b/tests/test_manpage.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Tests man pages. # -# Version: 20230410 +# Version: 20240413 EXIT_SUCCESS=0; EXIT_FAILURE=1; @@ -45,12 +45,9 @@ then exit ${EXIT_IGNORE}; fi -TEST_RUNNER="tests/test_runner.sh"; +TEST_DIRECTORY=`dirname $0`; -if ! test -f "${TEST_RUNNER}"; -then - TEST_RUNNER="./test_runner.sh"; -fi +TEST_RUNNER="${TEST_DIRECTORY}/test_runner.sh"; if ! test -f "${TEST_RUNNER}"; then