75 lines
2.3 KiB
Diff
75 lines
2.3 KiB
Diff
|
From: Jan Engelhardt <jengelh@inai.de>
|
||
|
|
Date: 2021-05-12 17:36:02.536572543 +0200
|
||
|
|
|
||
|
|
Some dirs are not present in snapshots directly generated from git
|
||
|
|
(nor are they marked as a submodule). Patch it out, since we have
|
||
|
|
them as system libs.
|
||
|
|
---
|
||
|
|
Makefile.am | 21 ---------------------
|
||
|
|
configure.ac | 11 -----------
|
||
|
|
2 files changed, 32 deletions(-)
|
||
|
|
|
||
|
|
Index: libodraw/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- libodraw.orig/Makefile.am
|
||
|
|
+++ libodraw/Makefile.am
|
||
|
|
@@ -3,18 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
|
||
|
|
SUBDIRS = \
|
||
|
|
include \
|
||
|
|
common \
|
||
|
|
- libcerror \
|
||
|
|
- libcthreads \
|
||
|
|
- libcdata \
|
||
|
|
- libclocale \
|
||
|
|
- libcnotify \
|
||
|
|
- libcsplit \
|
||
|
|
- libuna \
|
||
|
|
- libcfile \
|
||
|
|
- libcpath \
|
||
|
|
- libbfio \
|
||
|
|
libodraw \
|
||
|
|
- libhmac \
|
||
|
|
odrawtools \
|
||
|
|
po \
|
||
|
|
manuals \
|
||
|
|
@@ -66,16 +55,6 @@ lib: library
|
||
|
|
|
||
|
|
library:
|
||
|
|
(cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS))
|
||
|
|
- (cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS))
|
||
|
|
- (cd $(srcdir)/libcthreads && $(MAKE) $(AM_MAKEFLAGS))
|
||
|
|
- (cd $(srcdir)/libcdata && $(MAKE) $(AM_MAKEFLAGS))
|
||
|
|
- (cd $(srcdir)/libclocale && $(MAKE) $(AM_MAKEFLAGS))
|
||
|
|
- (cd $(srcdir)/libcnotify && $(MAKE) $(AM_MAKEFLAGS))
|
||
|
|
- (cd $(srcdir)/libcsplit && $(MAKE) $(AM_MAKEFLAGS))
|
||
|
|
- (cd $(srcdir)/libuna && $(MAKE) $(AM_MAKEFLAGS))
|
||
|
|
- (cd $(srcdir)/libcfile && $(MAKE) $(AM_MAKEFLAGS))
|
||
|
|
- (cd $(srcdir)/libcpath && $(MAKE) $(AM_MAKEFLAGS))
|
||
|
|
- (cd $(srcdir)/libbfio && $(MAKE) $(AM_MAKEFLAGS))
|
||
|
|
(cd $(srcdir)/libodraw && $(MAKE) $(AM_MAKEFLAGS))
|
||
|
|
(cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
|
||
|
|
|
||
|
|
Index: libodraw/configure.ac
|
||
|
|
===================================================================
|
||
|
|
--- libodraw.orig/configure.ac
|
||
|
|
+++ libodraw/configure.ac
|
||
|
|
@@ -145,18 +145,7 @@ dnl Generate Makefiles
|
||
|
|
AC_CONFIG_FILES([Makefile])
|
||
|
|
AC_CONFIG_FILES([include/Makefile])
|
||
|
|
AC_CONFIG_FILES([common/Makefile])
|
||
|
|
-AC_CONFIG_FILES([libcerror/Makefile])
|
||
|
|
-AC_CONFIG_FILES([libcthreads/Makefile])
|
||
|
|
-AC_CONFIG_FILES([libcdata/Makefile])
|
||
|
|
-AC_CONFIG_FILES([libclocale/Makefile])
|
||
|
|
-AC_CONFIG_FILES([libcnotify/Makefile])
|
||
|
|
-AC_CONFIG_FILES([libcsplit/Makefile])
|
||
|
|
-AC_CONFIG_FILES([libuna/Makefile])
|
||
|
|
-AC_CONFIG_FILES([libcfile/Makefile])
|
||
|
|
-AC_CONFIG_FILES([libcpath/Makefile])
|
||
|
|
-AC_CONFIG_FILES([libbfio/Makefile])
|
||
|
|
AC_CONFIG_FILES([libodraw/Makefile])
|
||
|
|
-AC_CONFIG_FILES([libhmac/Makefile])
|
||
|
|
AC_CONFIG_FILES([odrawtools/Makefile])
|
||
|
|
AC_CONFIG_FILES([po/Makefile.in])
|
||
|
|
AC_CONFIG_FILES([po/Makevars])
|