Skip to content

Commit

Permalink
Removed dependency on libcstring
Browse files Browse the repository at this point in the history
  • Loading branch information
joachimmetz committed Jan 20, 2019
1 parent b45d7dc commit 351316b
Show file tree
Hide file tree
Showing 113 changed files with 2,140 additions and 2,959 deletions.
3 changes: 0 additions & 3 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = \
include \
common \
libcstring \
libcerror \
libcthreads \
libcdata \
Expand Down Expand Up @@ -86,7 +85,6 @@ lib: library

library:
(cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libcstring && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libcdata && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libclocale && $(MAKE) $(AM_MAKEFLAGS))
Expand Down Expand Up @@ -119,7 +117,6 @@ distclean: clean
done && test -z "$$fail"

splint:
(cd $(srcdir)/libcstring && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/libcerror && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/libcdata && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/libcdatetime && $(MAKE) splint $(AM_MAKEFLAGS))
Expand Down
2 changes: 1 addition & 1 deletion common/byte_stream.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Byte stream functions
*
* Copyright (C) 2006-2018, Joachim Metz <[email protected]>
* Copyright (C) 2006-2019, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/common.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Common include file
*
* Copyright (C) 2006-2018, Joachim Metz <[email protected]>
* Copyright (C) 2006-2019, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/config_borlandc.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Configuration for the Borland/CodeGear C++ Builder compiler
*
* Copyright (C) 2006-2018, Joachim Metz <[email protected]>
* Copyright (C) 2006-2019, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/config_msc.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Configuration for the Microsoft Visual Studio C++ compiler
*
* Copyright (C) 2006-2018, Joachim Metz <[email protected]>
* Copyright (C) 2006-2019, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/config_winapi.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Configuration file for WINAPI
*
* Copyright (C) 2006-2018, Joachim Metz <[email protected]>
* Copyright (C) 2006-2019, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/file_stream.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* FILE stream functions
*
* Copyright (C) 2006-2018, Joachim Metz <[email protected]>
* Copyright (C) 2006-2019, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/memory.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Memory functions
*
* Copyright (C) 2006-2018, Joachim Metz <[email protected]>
* Copyright (C) 2006-2019, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/narrow_string.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Narrow character string functions
*
* Copyright (C) 2006-2018, Joachim Metz <[email protected]>
* Copyright (C) 2006-2019, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/system_string.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* System character string functions
*
* Copyright (C) 2006-2018, Joachim Metz <[email protected]>
* Copyright (C) 2006-2019, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/types.h.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Type and type-support defintions
*
* Copyright (C) 2006-2018, Joachim Metz <[email protected]>
* Copyright (C) 2006-2019, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/wide_string.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Wide character string functions
*
* Copyright (C) 2006-2018, Joachim Metz <[email protected]>
* Copyright (C) 2006-2019, Joachim Metz <[email protected]>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
7 changes: 1 addition & 6 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@ AX_TYPES_CHECK_LOCAL
dnl Checks for libraries and library functions
AX_COMMON_CHECK_LOCAL

dnl Check for enabling libcstring for cross-platform C string functions
AX_LIBCSTRING_CHECK_ENABLE

dnl Check for enabling libcerror for cross-platform C error functions
AX_LIBCERROR_CHECK_ENABLE

Expand Down Expand Up @@ -194,7 +191,7 @@ CFLAGS="$CFLAGS -Wall";

dnl Check if requires and build requires should be set in spec file
AS_IF(
[test "x$ac_cv_libcstring" = xyes || test "x$ac_cv_libcerror" = xyes || test "x$ac_cv_libcthreads" = xyes || test "x$ac_cv_libcdata" = xyes || test "x$ac_cv_libclocale" = xyes || test "x$ac_cv_libcnotify" = xyes || test "x$ac_cv_libcsplit" = xyes || test "x$ac_cv_libuna" = xyes || test "x$ac_cv_libcfile" = xyes || test "x$ac_cv_libcpath" = xyes || test "x$ac_cv_libbfio" = xyes || test "x$ac_cv_libfcache" = xyes || test "x$ac_cv_libfdata" = xyes || test "x$ac_cv_libfvalue" = xyes || test "x$ac_cv_libmfdata" = xyes || test "x$ac_cv_zlib" != xno || test "x$ac_cv_libhmac" = xyes],
[test "x$ac_cv_libcerror" = xyes || test "x$ac_cv_libcthreads" = xyes || test "x$ac_cv_libcdata" = xyes || test "x$ac_cv_libclocale" = xyes || test "x$ac_cv_libcnotify" = xyes || test "x$ac_cv_libcsplit" = xyes || test "x$ac_cv_libuna" = xyes || test "x$ac_cv_libcfile" = xyes || test "x$ac_cv_libcpath" = xyes || test "x$ac_cv_libbfio" = xyes || test "x$ac_cv_libfcache" = xyes || test "x$ac_cv_libfdata" = xyes || test "x$ac_cv_libfvalue" = xyes || test "x$ac_cv_libmfdata" = xyes || test "x$ac_cv_zlib" != xno || test "x$ac_cv_libhmac" = xyes],
[AC_SUBST(
[libewf_spec_requires],
[Requires:])
Expand All @@ -221,7 +218,6 @@ dnl Generate Makefiles
AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([include/Makefile])
AC_CONFIG_FILES([common/Makefile])
AC_CONFIG_FILES([libcstring/Makefile])
AC_CONFIG_FILES([libcerror/Makefile])
AC_CONFIG_FILES([libcthreads/Makefile])
AC_CONFIG_FILES([libcdata/Makefile])
Expand Down Expand Up @@ -275,7 +271,6 @@ AC_OUTPUT
dnl Print a summary
AC_MSG_NOTICE([
Building:
libcstring support: $ac_cv_libcstring
libcerror support: $ac_cv_libcerror
libcthreads support: $ac_cv_libcthreads
libcdata support: $ac_cv_libcdata
Expand Down
3 changes: 0 additions & 3 deletions ewftools-mt/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ if HAVE_CXX11
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/common \
@LIBCSTRING_CPPFLAGS@ \
@LIBCERROR_CPPFLAGS@ \
@LIBCDATA_CPPFLAGS@ \
@LIBCDATETIME_CPPFLAGS@ \
Expand Down Expand Up @@ -48,7 +47,6 @@ ewfacquirestream_SOURCES = \
../ewftools/ewftools_libcnotify.h \
../ewftools/ewftools_libcpath.h \
../ewftools/ewftools_libcsplit.h \
../ewftools/ewftools_libcstring.h \
../ewftools/ewftools_libewf.h \
../ewftools/ewftools_libhmac.h \
../ewftools/ewftools_libodraw.h \
Expand All @@ -74,7 +72,6 @@ ewfacquirestream_LDADD = \
@LIBCNOTIFY_LIBADD@ \
@LIBCLOCALE_LIBADD@ \
@LIBCERROR_LIBADD@ \
@LIBCSTRING_LIBADD@ \
@LIBINTL@ \
@PTHREAD_LIBADD@ \
-lstdc++
Expand Down
Loading

0 comments on commit 351316b

Please sign in to comment.