build: Fix automake warnings
authorMatthew Booth <mbooth@redhat.com>
Wed, 4 Jan 2012 09:56:16 +0000 (09:56 +0000)
committerRichard W.M. Jones <rjones@redhat.com>
Wed, 4 Jan 2012 10:38:44 +0000 (10:38 +0000)
perl/Makefile.am
resize/Makefile.am
sparsify/Makefile.am

index e924cb1..5ee6c49 100644 (file)
@@ -40,11 +40,9 @@ if HAVE_PERL
 # a nightmare, news at 11.
 
 # src/ dependencies
 # a nightmare, news at 11.
 
 # src/ dependencies
-.PHONY: src_deps
 src_deps: $(top_builddir)/src/libguestfs.la $(generator_built)
 
 # Images used by tests
 src_deps: $(top_builddir)/src/libguestfs.la $(generator_built)
 
 # Images used by tests
-.PHONY: test_images
 test_images:
        $(MAKE) -C $(top_builddir)/tests/data
 
 test_images:
        $(MAKE) -C $(top_builddir)/tests/data
 
@@ -76,3 +74,5 @@ install-data-hook:
        $(MAKE) -f Makefile-pl DESTDIR=$(DESTDIR) install
 
 endif
        $(MAKE) -f Makefile-pl DESTDIR=$(DESTDIR) install
 
 endif
+
+.PHONY: src_deps test_images
index 5046a8c..3f33118 100644 (file)
@@ -17,6 +17,8 @@
 
 include $(top_srcdir)/subdir-rules.mk
 
 
 include $(top_srcdir)/subdir-rules.mk
 
+SOURCES =
+
 EXTRA_DIST = \
        $(SOURCES) \
        virt-resize.pod \
 EXTRA_DIST = \
        $(SOURCES) \
        virt-resize.pod \
@@ -27,7 +29,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img
 if HAVE_OCAML
 
 # Alphabetical order.
 if HAVE_OCAML
 
 # Alphabetical order.
-SOURCES = \
+SOURCES += \
        progress_c.c \
        progress.mli \
        progress.ml \
        progress_c.c \
        progress.mli \
        progress.ml \
@@ -120,10 +122,10 @@ depend: .depend
 
 include .depend
 
 
 include .depend
 
-.PHONY: depend docs
-
 endif
 
 endif
 
+.PHONY: depend docs
+
 # Parallel builds don't obey dependencies for some reason we
 # don't understand.
 .NOTPARALLEL:
 # Parallel builds don't obey dependencies for some reason we
 # don't understand.
 .NOTPARALLEL:
index 973bcb5..9d5e076 100644 (file)
@@ -17,6 +17,8 @@
 
 include $(top_srcdir)/subdir-rules.mk
 
 
 include $(top_srcdir)/subdir-rules.mk
 
+SOURCES =
+
 EXTRA_DIST = \
        $(SOURCES) \
        virt-sparsify.pod \
 EXTRA_DIST = \
        $(SOURCES) \
        virt-sparsify.pod \
@@ -27,7 +29,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify test.img
 if HAVE_OCAML
 
 # Alphabetical order.
 if HAVE_OCAML
 
 # Alphabetical order.
-SOURCES = \
+SOURCES += \
        progress_c.c \
        progress.mli \
        progress.ml \
        progress_c.c \
        progress.mli \
        progress.ml \
@@ -113,10 +115,10 @@ depend: .depend
 
 include .depend
 
 
 include .depend
 
-.PHONY: depend docs
-
 endif
 
 endif
 
+.PHONY: depend docs
+
 # Parallel builds don't obey dependencies for some reason we
 # don't understand.
 .NOTPARALLEL:
 # Parallel builds don't obey dependencies for some reason we
 # don't understand.
 .NOTPARALLEL: