mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

automake: Admit defeat and use 'subdir-objects'.

Browse Source 
Because this 'feature' is broken (since 2013):

  https://debbugs.gnu.org/cgi/bugreport.cgi?bug=13928

we have to replace all instances of $(top_srcdir) in *_SOURCES lines
with a relative path.  According to what I read, this shouldn't break
split builds, but I didn't test it.

The only things automake moans about now are:

* Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/\${ <-- HERE ([^ \t=:+{}]+)}/ at /usr/bin/automake line 3936.

  - This is another bug in automake

* autoreconf: configure.ac: AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_VERSION

  - This is a feature, not a bug.
This commit is contained in:
Richard W.M. Jones
2015-08-04 19:54:02 +01:00
parent f3ed65525c
commit 91c06391c1
12 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -23,6 +23,7 @@
bindtests.tmp
cscope.out
.deps
.dirstamp
.gdb_history
.libs
Makefile

14
builder/Makefile.am
View File

@@ -69,13 +69,13 @@ SOURCES_ML = \
builder.ml
SOURCES_C = \
$(top_srcdir)/mllib/fsync-c.c \
$(top_srcdir)/mllib/uri-c.c \
$(top_srcdir)/mllib/mkdtemp-c.c \
$(top_srcdir)/customize/perl_edit-c.c \
$(top_srcdir)/customize/crypt-c.c \
$(top_srcdir)/fish/uri.c \
$(top_srcdir)/fish/file-edit.c \
../mllib/fsync-c.c \
../mllib/uri-c.c \
../mllib/mkdtemp-c.c \
../customize/perl_edit-c.c \
../customize/crypt-c.c \
../fish/uri.c \
../fish/file-edit.c \
index-scan.c \
index-struct.c \
index-parse.c \

2
configure.ac
View File

@@ -47,7 +47,7 @@ m4_define([serial_tests], [
}'
])
])
AM_INIT_AUTOMAKE(foreign serial_tests) dnl NB: Do not [quote] this parameter.
AM_INIT_AUTOMAKE(foreign serial_tests subdir-objects) dnl NB: Do not [quote] this parameter.
m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.

8
customize/Makefile.am
View File

@@ -65,10 +65,10 @@ SOURCES_ML = \
customize_main.ml
SOURCES_C = \
$(top_srcdir)/fish/uri.c \
$(top_srcdir)/fish/file-edit.c \
$(top_srcdir)/fish/file-edit.h \
$(top_srcdir)/mllib/uri-c.c \
../fish/uri.c \
../fish/file-edit.c \
../fish/file-edit.h \
../mllib/uri-c.c \
crypt-c.c \
perl_edit-c.c

2
dib/Makefile.am
View File

@@ -30,7 +30,7 @@ SOURCES_ML = \
dib.ml
SOURCES_C = \
$(top_srcdir)/mllib/mkdtemp-c.c
../mllib/mkdtemp-c.c
bin_PROGRAMS =

4
get-kernel/Makefile.am
View File

@@ -27,8 +27,8 @@ SOURCES_ML = \
get_kernel.ml
SOURCES_C = \
$(top_srcdir)/mllib/uri-c.c \
$(top_srcdir)/fish/uri.c
../mllib/uri-c.c \
../fish/uri.c
man_MANS =
noinst_DATA =

4
mllib/Makefile.am
View File

@@ -50,8 +50,8 @@ SOURCES_ML = \
JSON.ml
SOURCES_C = \
$(top_srcdir)/fish/progress.c \
$(top_srcdir)/fish/uri.c \
../fish/progress.c \
../fish/uri.c \
fsync-c.c \
mkdtemp-c.c \
progress-c.c \

10
resize/Makefile.am
View File

@@ -30,11 +30,11 @@ SOURCES_ML = \
resize.ml
SOURCES_C = \
$(top_srcdir)/mllib/fsync-c.c \
$(top_srcdir)/fish/progress.c \
$(top_srcdir)/mllib/progress-c.c \
$(top_srcdir)/fish/uri.c \
$(top_srcdir)/mllib/uri-c.c
../mllib/fsync-c.c \
../fish/progress.c \
../mllib/progress-c.c \
../fish/uri.c \
../mllib/uri-c.c
if HAVE_OCAML

4
sparsify/Makefile.am
View File

@@ -33,8 +33,8 @@ SOURCES_ML = \
sparsify.ml
SOURCES_C = \
$(top_srcdir)/fish/progress.c \
$(top_srcdir)/mllib/progress-c.c \
../fish/progress.c \
../mllib/progress-c.c \
statvfs-c.c
if HAVE_OCAML

12
sysprep/Makefile.am
View File

@@ -79,12 +79,12 @@ SOURCES_ML = \
main.ml
SOURCES_C = \
$(top_srcdir)/mllib/uri-c.c \
$(top_srcdir)/mllib/mkdtemp-c.c \
$(top_srcdir)/customize/crypt-c.c \
$(top_srcdir)/customize/perl_edit-c.c \
$(top_srcdir)/fish/uri.c \
$(top_srcdir)/fish/file-edit.c
../mllib/uri-c.c \
../mllib/mkdtemp-c.c \
../customize/crypt-c.c \
../customize/perl_edit-c.c \
../fish/uri.c \
../fish/file-edit.c
if HAVE_OCAML

4
tests/mount-local/Makefile.am
View File

@@ -27,8 +27,8 @@ check_PROGRAMS = $(TESTS)
test_parallel_mount_local_SOURCES = \
test-parallel-mount-local.c \
$(top_srcdir)/df/estimate-max-threads.c \
$(top_srcdir)/df/estimate-max-threads.h
../../df/estimate-max-threads.c \
../../df/estimate-max-threads.h
test_parallel_mount_local_CPPFLAGS = \
-DGUESTFS_WARN_DEPRECATED=1 \
-I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \

2
v2v/Makefile.am
View File

@@ -97,7 +97,7 @@ SOURCES_ML = \
v2v.ml
SOURCES_C = \
$(top_srcdir)/mllib/mkdtemp-c.c \
../mllib/mkdtemp-c.c \
domainxml-c.c \
kvmuid-c.c \
utils-c.c \