diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2012-03-31 23:17:05 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-04-02 13:43:33 +0100 |
| commit | f671ae81df5e57148c666e1c8b252d0d661bc8ac (patch) | |
| tree | 9b979900a30a3fe8bdb5ae874c7c9bdb34344303 | |
| parent | bcd717553d04900010a3eca8dc20d9f39319c419 (diff) | |
| download | libguestfs-f671ae81df5e57148c666e1c8b252d0d661bc8ac.tar.gz libguestfs-f671ae81df5e57148c666e1c8b252d0d661bc8ac.tar.xz libguestfs-f671ae81df5e57148c666e1c8b252d0d661bc8ac.zip | |
Ensure that SOURCES are always in EXTRA_DIST, even if OCaml not available.
(cherry picked from commit 6e3de762782b050fe7ad675297089a42026f05c4)
| -rw-r--r-- | resize/Makefile.am | 8 | ||||
| -rw-r--r-- | sparsify/Makefile.am | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/resize/Makefile.am b/resize/Makefile.am index ce9186f2..bd15a329 100644 --- a/resize/Makefile.am +++ b/resize/Makefile.am @@ -17,8 +17,6 @@ include $(top_srcdir)/subdir-rules.mk -SOURCES = - EXTRA_DIST = \ $(SOURCES) \ virt-resize.pod \ @@ -26,10 +24,8 @@ EXTRA_DIST = \ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img -if HAVE_OCAML - # Alphabetical order. -SOURCES += \ +SOURCES = \ progress_c.c \ progress.mli \ progress.ml \ @@ -37,6 +33,8 @@ SOURCES += \ utils.ml \ utils_tests.ml +if HAVE_OCAML + # Note this list must be in dependency order. OBJECTS = \ $(top_builddir)/fish/guestfish-progress.o \ diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am index b33e121f..efe8278d 100644 --- a/sparsify/Makefile.am +++ b/sparsify/Makefile.am @@ -17,8 +17,6 @@ include $(top_srcdir)/subdir-rules.mk -SOURCES = - EXTRA_DIST = \ $(SOURCES) \ virt-sparsify.pod \ @@ -26,16 +24,16 @@ EXTRA_DIST = \ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify test.img -if HAVE_OCAML - # Alphabetical order. -SOURCES += \ +SOURCES = \ progress_c.c \ progress.mli \ progress.ml \ sparsify.ml \ utils.ml +if HAVE_OCAML + # Note this list must be in dependency order. OBJECTS = \ $(top_builddir)/fish/guestfish-progress.o \ |