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-03-31 23:17:41 +0100 |
| commit | 6e3de762782b050fe7ad675297089a42026f05c4 (patch) | |
| tree | c4a89c98faf993bd65785b7643ea86c3bd8c86db | |
| parent | ad43dde9c87a6c3d58c626d2fa42dd68c2e15e01 (diff) | |
| download | libguestfs-6e3de762782b050fe7ad675297089a42026f05c4.tar.gz libguestfs-6e3de762782b050fe7ad675297089a42026f05c4.tar.xz libguestfs-6e3de762782b050fe7ad675297089a42026f05c4.zip | |
Ensure that SOURCES are always in EXTRA_DIST, even if OCaml not available.
| -rw-r--r-- | resize/Makefile.am | 8 | ||||
| -rw-r--r-- | sparsify/Makefile.am | 8 | ||||
| -rw-r--r-- | sysprep/Makefile.am | 8 |
3 files changed, 9 insertions, 15 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 \ diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index d2303a68..38e4e94a 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Makefile.am @@ -17,8 +17,6 @@ include $(top_srcdir)/subdir-rules.mk -SOURCES = - EXTRA_DIST = \ $(SOURCES) \ test-virt-sysprep.sh \ @@ -26,10 +24,8 @@ EXTRA_DIST = \ CLEANFILES = stamp-virt-sysprep.pod -if HAVE_OCAML - # Alphabetical order. -SOURCES += \ +SOURCES = \ main.ml \ sysprep_operation.ml \ sysprep_operation.mli \ @@ -50,6 +46,8 @@ SOURCES += \ sysprep_operation_yum_uuid.ml \ utils.ml +if HAVE_OCAML + # Note this list must be in dependency order. OBJECTS = \ utils.cmx \ |