Skip to content

Commit

Permalink
build: Remove bundled copy of ocaml-augeas
Browse files Browse the repository at this point in the history
This is now an external dependency.
  • Loading branch information
rwmjones committed Jan 19, 2023
1 parent e0d23c8 commit fbf7fe8
Show file tree
Hide file tree
Showing 14 changed files with 17 additions and 1,472 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ Makefile.in
/build-aux/snippet/
/build-aux/test-driver
/build-aux/ylwrap
/bundled/ocaml-augeas/.depend
/compile
/config.cache
/config.guess
Expand Down
5 changes: 2 additions & 3 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ SUBDIRS += include lib docs examples

# The daemon and the appliance.
SUBDIRS += common/mlutils
SUBDIRS += bundled/ocaml-augeas
SUBDIRS += common/mlpcre
if ENABLE_DAEMON
SUBDIRS += daemon
Expand Down Expand Up @@ -215,7 +214,7 @@ dist-hook: docs/C_SOURCE_FILES po/POTFILES
docs/C_SOURCE_FILES: configure.ac
rm -f $@ $@-t
find $(DIST_SUBDIRS) -name '*.[ch]' | \
grep -v -E '^(builder/index-parse\.|builder/index-scan\.|examples/|gobject/|java/com_redhat_et_libguestfs|perl/|php/extension/config\.h|ruby/ext/guestfs/extconf\.h|tests/|test-data/|bundled/)' | \
grep -v -E '^(builder/index-parse\.|builder/index-scan\.|examples/|gobject/|java/com_redhat_et_libguestfs|perl/|php/extension/config\.h|ruby/ext/guestfs/extconf\.h|tests/|test-data/)' | \
grep -v -E '/(guestfs|rc)_protocol\.' | \
grep -v -E '.*/errnostring\.' | \
grep -v -E '.*-gperf\.' | \
Expand All @@ -228,7 +227,7 @@ po/POTFILES: configure.ac
rm -f $@ $@-t
cd $(srcdir); \
find $(DIST_SUBDIRS) -name '*.c' | \
grep -v -E '^(examples|perl/(blib|examples)|po-docs|tests|test-data|bundled)/' | \
grep -v -E '^(examples|perl/(blib|examples)|po-docs|tests|test-data)/' | \
grep -v -E '/((guestfs|rc)_protocol\.c|dummy\.c)$$' | \
grep -v -E '^python/utils\.c$$' | \
grep -v -E '^perl/lib/Sys/Guestfs\.c$$' | \
Expand Down
515 changes: 0 additions & 515 deletions bundled/ocaml-augeas/COPYING.LIB

This file was deleted.

82 changes: 0 additions & 82 deletions bundled/ocaml-augeas/Makefile.am

This file was deleted.

0 comments on commit fbf7fe8

Please sign in to comment.