Changes for deployment

libyal · Apr 14, 2024 · 43ebd87 · 43ebd87
1 parent 9f77bd1
commit 43ebd87
Show file tree

Hide file tree

Showing 18 changed files with 144 additions and 121 deletions.
diff --git a/.gitignore b/.gitignore
@@ -133,6 +133,7 @@ stamp-h[1-9]
 /tests/cdirectory_test_error
 /tests/cdirectory_test_support
 /tests/cdirectory_test_system_string
+/tests/TestFile
 /tests/tmp*
 
 # Local library dependencies specific files

diff --git a/Makefile.am b/Makefile.am
@@ -40,8 +40,15 @@ EXTRA_DIST = \
 	$(PKGCONFIG_FILES) \
 	$(SPEC_FILES)
 
-MAINTAINERCLEANFILES = \
-	Makefile.in
+DISTCLEANFILES = \
+	config.status \
+	config.cache \
+	config.log \
+	libcdirectory.pc \
+	libcdirectory.spec \
+	Makefile \
+	Makefile.in \
+	po/Makevars
 
 pkgconfigdir = $(libdir)/pkgconfig
 
@@ -61,15 +68,3 @@ library:
 	cd $(srcdir)/libcdirectory && $(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 libcdirectory.pc
-	-rm -f libcdirectory.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/appveyor.yml b/appveyor.yml
@@ -117,8 +117,8 @@ environment:
 install:
 - cmd: if [%BUILD_ENVIRONMENT%]==[msbuild] (
     git clone https://github.com/libyal/vstools.git ..\vstools )
-- sh: if test ${BUILD_ENVIRONMENT} = "python-tox" || test ${BUILD_ENVIRONMENT} = "xcode"; then brew update-reset && brew update -q; fi
-- sh: if test ${BUILD_ENVIRONMENT} = "python-tox" || test ${BUILD_ENVIRONMENT} = "xcode"; then brew install -q autoconf automake gettext gnu-sed libtool pkg-config || true; fi
+- sh: if ( test `uname -s` = "Darwin" && test ${BUILD_ENVIRONMENT} = "python-tox" ) || test ${BUILD_ENVIRONMENT} = "xcode"; then brew update-reset && brew update -q; fi
+- sh: if ( test `uname -s` = "Darwin" && test ${BUILD_ENVIRONMENT} = "python-tox" ) || test ${BUILD_ENVIRONMENT} = "xcode"; then brew install -q autoconf automake gettext gnu-sed libtool pkg-config || true; fi
 - ps: If ($env:BUILD_ENVIRONMENT -eq "cygwin64") {
     (New-Object Net.WebClient).DownloadFile("https://cygwin.com/setup-x86_64.exe", "C:\\cygwin64\\setup-x86_64.exe") }
 - cmd: if [%BUILD_ENVIRONMENT%]==[cygwin64] (
@@ -129,7 +129,7 @@ install:
     $ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest -Uri https://uploader.codecov.io/latest/windows/codecov.exe -Outfile ..\codecov.exe }
 
 build_script:
-- ps: If ($env:BUILD_ENVIRONMENT -eq "msbuild" -or ($env:BUILD_ENVIRONMENT -eq "python" -and $isWindows)) {
+- ps: If ($env:BUILD_ENVIRONMENT -eq "msbuild" -or ($env:BUILD_ENVIRONMENT -eq "python-tox" -and $isWindows)) {
     .\synclibs.ps1;
     .\autogen.ps1 }
 - ps: If ($env:TARGET -eq "vs2008") {

diff --git a/common/Makefile.am b/common/Makefile.am
@@ -1,4 +1,5 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = \
+	-I../include -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
@@ -2,7 +2,7 @@ AC_PREREQ([2.71])
 
 AC_INIT(
  [libcdirectory],
- [20240322],
+ [20240414],
  [[email protected]])
 
 AC_CONFIG_SRCDIR(

diff --git a/include/Makefile.am b/include/Makefile.am
@@ -15,13 +15,11 @@ EXTRA_DIST = \
 	libcdirectory/features.h.in \
 	libcdirectory/types.h.in
 
-MAINTAINERCLEANFILES = \
+DISTCLEANFILES = \
+	libcdirectory.h \
+	libcdirectory/definitions.h \
+	libcdirectory/features.h \
+	libcdirectory/types.h \
+	Makefile \
 	Makefile.in
 
-distclean: clean
-	-rm -f libcdirectory.h
-	-rm -f libcdirectory/definitions.h
-	-rm -f libcdirectory/features.h
-	-rm -f libcdirectory/types.h
-	-rm -f Makefile
-
diff --git a/libcdirectory/Makefile.am b/libcdirectory/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@ \
 	@LIBCLOCALE_CPPFLAGS@ \
 	@LIBUNA_CPPFLAGS@ \
@@ -36,14 +36,12 @@ EXTRA_DIST = \
 	libcdirectory.rc \
 	libcdirectory.rc.in
 
-MAINTAINERCLEANFILES = \
+DISTCLEANFILES = \
+	libcdirectory_definitions.h \
+	libcdirectory.rc \
+	Makefile \
 	Makefile.in
 
-distclean: clean
-	-rm -f libcdirectory_definitions.h
-	-rm -f libcdirectory.rc
-	-rm -f Makefile
-
 sources-local: $(BUILT_SOURCES)
 
 splint-local:

diff --git 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<library> 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/m4/libclocale.m4 b/m4/libclocale.m4
@@ -1,6 +1,6 @@
 dnl Checks for libclocale required headers and functions
 dnl
-dnl Version: 20240314
+dnl Version: 20240413
 
 dnl Function to detect if libclocale is available
 dnl ac_libclocale_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
@@ -223,7 +223,7 @@ AC_DEFUN([AX_LIBCLOCALE_CHECK_LOCAL],
 
   AX_LIBCLOCALE_CHECK_FUNC_LANGINFO_CODESET
 
-  ac_cv_libclocale_CPPFLAGS="-I../libclocale";
+  ac_cv_libclocale_CPPFLAGS="-I../libclocale -I\$(top_srcdir)/libclocale";
   ac_cv_libclocale_LIBADD="../libclocale/libclocale.la";
 
   ac_cv_libclocale=local

diff --git a/m4/libuna.m4 b/m4/libuna.m4
@@ -1,6 +1,6 @@
 dnl Checks for libuna or required headers and functions
 dnl
-dnl Version: 20240314
+dnl Version: 20240413
 
 dnl Function to detect if a specific libuna definition is available.
 AC_DEFUN([AX_LIBUNA_CHECK_DEFINITION],
@@ -976,7 +976,7 @@ dnl Function to detect if libuna dependencies are available
 AC_DEFUN([AX_LIBUNA_CHECK_LOCAL],
   [dnl No additional checks.
 
-  ac_cv_libuna_CPPFLAGS="-I../libuna";
+  ac_cv_libuna_CPPFLAGS="-I../libuna -I\$(top_srcdir)/libuna";
   ac_cv_libuna_LIBADD="../libuna/libuna.la";
 
   ac_cv_libuna=local

diff --git a/manuals/Makefile.am b/manuals/Makefile.am
@@ -4,9 +4,7 @@ man_MANS = \
 EXTRA_DIST = \
 	libcdirectory.3
 
-MAINTAINERCLEANFILES = \
+DISTCLEANFILES = \
+	Makefile \
 	Makefile.in
 
-distclean: clean
-	-rm -f Makefile
-
diff --git a/msvscpp/Makefile.am b/msvscpp/Makefile.am
@@ -13,9 +13,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
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Script that synchronizes the local library dependencies
 #
-# Version: 20231023
+# Version: 20240414
 
 EXIT_SUCCESS=0;
 EXIT_FAILURE=1;
@@ -95,10 +95,11 @@ endif
 	d
 }
 
-/distclean: clean/ {
+/DISTCLEANFILES = / {
 	n
-	N
-	d
+	/${LOCAL_LIB}_definitions.h/ {
+		d
+	}
 }";
 	echo "${SED_SCRIPT}" >> ${LOCAL_LIB}-$$.sed;
 	sed -i'~' -f ${LOCAL_LIB}-$$.sed ${LOCAL_LIB_MAKEFILE_AM};
@@ -140,7 +141,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
@@ -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@ \
 	@LIBCLOCALE_CPPFLAGS@ \
 	@LIBUNA_CPPFLAGS@ \
@@ -79,9 +79,8 @@ cdirectory_test_system_string_LDADD = \
 	../libcdirectory/libcdirectory.la \
 	@LIBCERROR_LIBADD@
 
-MAINTAINERCLEANFILES = \
-	Makefile.in
-
-distclean: clean
-	-rm -f Makefile
+DISTCLEANFILES = \
+	Makefile \
+	Makefile.in \
+	TestFile