build: Add common-rules.mk, common rules for all Makefiles.

This file is mainly a central place to: - include localenv if it exists, and - define the RHEL 5 backwards compatibility macros, instead of spreading them over every other file. (cherry picked from commit 49bdaab)
libguestfs · Jun 14, 2013 · 7bc6702 · 7bc6702
1 parent 92cf512
commit 7bc6702
Show file tree

Hide file tree

Showing 30 changed files with 56 additions and 73 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -18,6 +18,7 @@
 -include $(top_builddir)/localenv
 
 include $(top_srcdir)/subdir-rules.mk
+include $(top_srcdir)/common-rules.mk
 
 ACLOCAL_AMFLAGS = -I m4
 

diff --git a/appliance/Makefile.am b/appliance/Makefile.am
@@ -15,9 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-# Old RHEL 5 autoconf doesn't have builddir.
-builddir ?= .
-
 include $(top_srcdir)/subdir-rules.mk
 
 EXTRA_DIST = \

diff --git a/common-rules.mk b/common-rules.mk
@@ -0,0 +1,29 @@
+# libguestfs
+# Copyright (C) 2013 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+# 'common-rules.mk' should be included in every Makefile.am.
+# cf. 'subdir-rules.mk'
+
+-include $(top_builddir)/localenv
+
+# Old RHEL 5 autoconf defines these, but RHEL 5 automake doesn't
+# create variables for them.  So define them here if they're not
+# defined already.
+builddir     ?= @builddir@
+abs_builddir ?= @abs_builddir@
+srcdir       ?= @srcdir@
+abs_srcdir   ?= @abs_srcdir@
diff --git a/erlang/examples/Makefile.am b/erlang/examples/Makefile.am
@@ -15,6 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+include $(top_srcdir)/subdir-rules.mk
+
 EXTRA_DIST = \
 	LICENSE \
 	create_disk.erl \

diff --git a/examples/Makefile.am b/examples/Makefile.am
@@ -15,6 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+include $(top_srcdir)/subdir-rules.mk
+
 EXTRA_DIST = \
 	LICENSE \
 	guestfs-examples.pod \

diff --git a/generator/Makefile.am b/generator/Makefile.am
@@ -15,14 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-# Old RHEL 5 autoconf doesn't have abs_builddir.
+include $(top_srcdir)/subdir-rules.mk
-abs_builddir ?= $(shell pwd)
-
-# Old RHEL 5 autoconf doesn't have abs_srcdir.
-abs_srcdir ?= $(shell cd $(top_srcdir)/generator && pwd)
-
-# Old RHEL 5 autoconf doesn't have builddir.
-builddir ?= .
 
 # In alphabetical order.
 sources = \

diff --git a/gobject/docs/Makefile.am b/gobject/docs/Makefile.am
@@ -15,14 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-# Old RHEL 5 autoconf doesn't have builddir.
+include $(top_srcdir)/subdir-rules.mk
-builddir ?= .
-
-# Old RHEL 5 autoconf doesn't have abs_srcdir.
-abs_srcdir ?= $(shell cd $(top_srcdir)/gobject/docs && pwd)
-
-# Old RHEL 5 autoconf doesn't have abs_builddir.
-abs_builddir ?= $(shell pwd)
 
 # The name of the module, e.g. 'glib'.
 DOC_MODULE=guestfs

diff --git a/inspector/Makefile.am b/inspector/Makefile.am
@@ -15,9 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-# Old RHEL 5 autoconf doesn't have builddir.
-builddir ?= .
-
 include $(top_srcdir)/subdir-rules.mk
 
 export EXAMPLE_XML = \

diff --git a/java/Makefile.am b/java/Makefile.am
@@ -15,9 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-# Old RHEL 5 autoconf doesn't have builddir.
-builddir ?= .
-
 include $(top_srcdir)/subdir-rules.mk
 
 java_prefix = com/redhat/et/libguestfs

diff --git a/java/examples/Makefile.am b/java/examples/Makefile.am
@@ -15,6 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+include $(top_srcdir)/subdir-rules.mk
+
 EXTRA_DIST = \
 	LICENSE \
 	CreateDisk.java \

diff --git a/lua/examples/Makefile.am b/lua/examples/Makefile.am
@@ -15,6 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+include $(top_srcdir)/subdir-rules.mk
+
 EXTRA_DIST = \
 	LICENSE \
 	create_disk.lua \

diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
@@ -15,12 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-# Old RHEL 5 autoconf doesn't have builddir.
-builddir ?= .
-
-# Old RHEL 5 autoconf doesn't have abs_srcdir.
-abs_srcdir ?= $(shell cd $(top_srcdir)/ocaml && pwd)
-
 include $(top_srcdir)/subdir-rules.mk
 
 generator_built = \

diff --git a/ocaml/examples/Makefile.am b/ocaml/examples/Makefile.am
@@ -15,6 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+include $(top_srcdir)/subdir-rules.mk
+
 EXTRA_DIST = \
 	LICENSE \
 	create_disk.ml \

diff --git a/perl/examples/Makefile.am b/perl/examples/Makefile.am
@@ -15,6 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+include $(top_srcdir)/subdir-rules.mk
+
 EXTRA_DIST = \
 	LICENSE \
 	create_disk.pl \

diff --git a/php/Makefile.am b/php/Makefile.am
@@ -17,9 +17,6 @@
 
 include $(top_srcdir)/subdir-rules.mk
 
-# Old RHEL 5 autoconf doesn't have abs_srcdir.
-abs_srcdir ?= $(shell cd $(top_srcdir)/php && pwd)
-
 generator_built = \
 	extension/php_guestfs_php.h \
 	extension/guestfs_php.c

diff --git a/po-docs/Makefile.am b/po-docs/Makefile.am
@@ -15,6 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+include $(top_srcdir)/subdir-rules.mk
+
 # XXX The use of po4a is naive here.  Also we should integrate this
 # into the po/ directory and the translations into the usual
 # libguestfs.pot file.

diff --git a/po-docs/ja/Makefile.am b/po-docs/ja/Makefile.am
@@ -19,6 +19,8 @@
 # identical.  If you create a new $lang.po, create the $lang/
 # subdirectory and copy the Makefile.am from an existing language.
 
+include $(top_srcdir)/subdir-rules.mk
+
 LINGUA = $(shell basename -- `pwd`)
 
 CLEANFILES = *.1 *.3 stamp-update-po

diff --git a/po-docs/uk/Makefile.am b/po-docs/uk/Makefile.am
@@ -19,6 +19,8 @@
 # identical.  If you create a new $lang.po, create the $lang/
 # subdirectory and copy the Makefile.am from an existing language.
 
+include $(top_srcdir)/subdir-rules.mk
+
 LINGUA = $(shell basename -- `pwd`)
 
 CLEANFILES = *.1 *.3 stamp-update-po

diff --git a/po/Makefile.am b/po/Makefile.am
@@ -17,9 +17,6 @@
 
 include $(top_srcdir)/subdir-rules.mk
 
-# Old RHEL 5 autoconf doesn't have abs_srcdir.
-abs_srcdir ?= $(shell cd $(top_srcdir)/po && pwd)
-
 DOMAIN = $(PACKAGE_NAME)
 COPYRIGHT_HOLDER = Red Hat Inc.
 MSGID_BUGS_ADDRESS = https://bugzilla.redhat.com/enter_bug.cgi?component=libguestfs&product=Virtualization+Tools

diff --git a/python/Makefile.am b/python/Makefile.am
@@ -15,9 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-# Old RHEL 5 autoconf doesn't have builddir.
-builddir ?= .
-
 include $(top_srcdir)/subdir-rules.mk
 
 generator_built = \

diff --git a/python/examples/Makefile.am b/python/examples/Makefile.am
@@ -15,6 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+include $(top_srcdir)/subdir-rules.mk
+
 EXTRA_DIST = \
 	LICENSE \
 	create_disk.py \

diff --git a/resize/Makefile.am b/resize/Makefile.am
@@ -15,12 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-# Old RHEL 5 autoconf doesn't have builddir.
-builddir ?= .
-
-# Old RHEL 5 autoconf doesn't have abs_srcdir.
-abs_srcdir ?= $(shell cd $(top_srcdir)/resize && pwd)
-
 include $(top_srcdir)/subdir-rules.mk
 
 EXTRA_DIST = \

diff --git a/ruby/Makefile.am b/ruby/Makefile.am
@@ -15,9 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-# Old RHEL 5 autoconf doesn't have builddir.
-builddir ?= .
-
 include $(top_srcdir)/subdir-rules.mk
 
 generator_built = \

diff --git a/ruby/examples/Makefile.am b/ruby/examples/Makefile.am
@@ -15,6 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+include $(top_srcdir)/subdir-rules.mk
+
 EXTRA_DIST = \
 	LICENSE \
 	create_disk.rb \

diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am
@@ -17,12 +17,6 @@
 
 include $(top_srcdir)/subdir-rules.mk
 
-# Old RHEL 5 autoconf doesn't have builddir.
-builddir ?= .
-
-# Old RHEL 5 autoconf doesn't have abs_srcdir.
-abs_srcdir ?= $(shell cd $(top_srcdir)/sparsify && pwd)
-
 EXTRA_DIST = \
 	$(SOURCES) \
 	virt-sparsify.pod \

diff --git a/subdir-rules.mk b/subdir-rules.mk
@@ -15,6 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+include $(top_srcdir)/common-rules.mk
+
 # Define a force dependency which will always be rebuilt
 .PHONY: force
 

diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am
@@ -15,15 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-# Old RHEL 5 autoconf doesn't have builddir.
-builddir ?= .
-
-# Old RHEL 5 autoconf doesn't have abs_srcdir.
-abs_srcdir ?= $(shell cd $(top_srcdir)/sysprep && pwd)
-
-# Old RHEL 5 autoconf doesn't have abs_builddir.
-abs_builddir ?= $(shell pwd)
-
 include $(top_srcdir)/subdir-rules.mk
 
 EXTRA_DIST = \

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
@@ -15,9 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-# Old RHEL 5 autoconf doesn't have builddir.
-builddir ?= .
-
 include $(top_srcdir)/subdir-rules.mk
 
 EXTRA_DIST = \

diff --git a/tests/guests/Makefile.am b/tests/guests/Makefile.am
@@ -15,9 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-# Old RHEL 5 autoconf doesn't have builddir.
-builddir ?= .
-
 include $(top_srcdir)/subdir-rules.mk
 
 EXTRA_DIST = \

diff --git a/tests/xml/Makefile.am b/tests/xml/Makefile.am
@@ -15,9 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-# Old RHEL 5 autoconf doesn't have abs_srcdir.
-abs_srcdir ?= $(shell cd $(top_srcdir)/tests/xml && pwd)
-
 include $(top_srcdir)/subdir-rules.mk
 
 if HAVE_LIBVIRT