tools/libfsimage: include Rules.mk first

Move the inclusion of Rules.mk up so that things like CFLAGS get initialized
properly. Currently only zfs appends CFLAGS. If CFLAGS get reset by Rules.mk
the private settings are lost and compilation of zfs support fails.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Committed-by: Ian Jackson <ian.jackson.citrix.com>

diff --git a/tools/libfsimage/ext2fs-lib/Makefile b/tools/libfsimage/ext2fs-lib/Makefile
index 142207f63b07f78725f5f6c1a1b13f4a98ca0e85..957279db6abcad4e3f5fc93eb803e8cbca56277d 100644 (file)
--- a/tools/libfsimage/ext2fs-lib/Makefile
+++ b/tools/libfsimage/ext2fs-lib/Makefile
@@ -1,4 +1,5 @@
 XEN_ROOT = $(CURDIR)/../../..
+include $(XEN_ROOT)/tools/libfsimage/Rules.mk
 
 LIB_SRCS-y = ext2fs-lib.c
 
@@ -11,5 +12,3 @@ all: fs-all
 
 .PHONY: install
 install: fs-install
-
-include $(XEN_ROOT)/tools/libfsimage/Rules.mk

diff --git a/tools/libfsimage/ext2fs/Makefile b/tools/libfsimage/ext2fs/Makefile
index 8ff4c71a1c13fecc0ebb51bc7dba4ac360ceef90..714651eccd1a26e152a35f7e7b1a67ce190917e6 100644 (file)
--- a/tools/libfsimage/ext2fs/Makefile
+++ b/tools/libfsimage/ext2fs/Makefile
@@ -1,4 +1,5 @@
 XEN_ROOT = $(CURDIR)/../../..
+include $(XEN_ROOT)/tools/libfsimage/Rules.mk
 
 LIB_SRCS-y = fsys_ext2fs.c
 
@@ -9,5 +10,3 @@ all: fs-all
 
 .PHONY: install
 install: fs-install
-
-include $(XEN_ROOT)/tools/libfsimage/Rules.mk

diff --git a/tools/libfsimage/fat/Makefile b/tools/libfsimage/fat/Makefile
index 2911a0e0e7cfb13c4c3ea1d03d284e0ef2d33c32..950181b4035ee9f3b1de67b5abd2a2f2f9dcb06b 100644 (file)
--- a/tools/libfsimage/fat/Makefile
+++ b/tools/libfsimage/fat/Makefile
@@ -1,4 +1,5 @@
 XEN_ROOT = $(CURDIR)/../../..
+include $(XEN_ROOT)/tools/libfsimage/Rules.mk
 
 LIB_SRCS-y = fsys_fat.c
 
@@ -9,5 +10,3 @@ all: fs-all
 
 .PHONY: install
 install: fs-install
-
-include $(XEN_ROOT)/tools/libfsimage/Rules.mk

diff --git a/tools/libfsimage/iso9660/Makefile b/tools/libfsimage/iso9660/Makefile
index 4096cafa0c1db76653c5ab284a6785355c9183c3..c07183ba3e9ff750311004f7276d0e751353df1d 100644 (file)
--- a/tools/libfsimage/iso9660/Makefile
+++ b/tools/libfsimage/iso9660/Makefile
@@ -1,4 +1,5 @@
 XEN_ROOT = $(CURDIR)/../../..
+include $(XEN_ROOT)/tools/libfsimage/Rules.mk
 
 LIB_SRCS-y = fsys_iso9660.c
 
@@ -11,5 +12,3 @@ all: fs-all
 install: fs-install
 
 fsys_iso9660.c: iso9660.h
-
-include $(XEN_ROOT)/tools/libfsimage/Rules.mk

diff --git a/tools/libfsimage/reiserfs/Makefile b/tools/libfsimage/reiserfs/Makefile
index 57f286b25655340b31b9961647a252c319f19c3b..6f01e06a281bf4e748ee451864518c0d55f141c9 100644 (file)
--- a/tools/libfsimage/reiserfs/Makefile
+++ b/tools/libfsimage/reiserfs/Makefile
@@ -1,4 +1,5 @@
 XEN_ROOT = $(CURDIR)/../../..
+include $(XEN_ROOT)/tools/libfsimage/Rules.mk
 
 LIB_SRCS-y = fsys_reiserfs.c
 
@@ -9,5 +10,3 @@ all: fs-all
 
 .PHONY: install
 install: fs-install
-
-include $(XEN_ROOT)/tools/libfsimage/Rules.mk

diff --git a/tools/libfsimage/ufs/Makefile b/tools/libfsimage/ufs/Makefile
index c1371080f5283e95d040d8c68138b1a17712f45d..116edd6b16a93e15d8341c4bb44e603e4fc84839 100644 (file)
--- a/tools/libfsimage/ufs/Makefile
+++ b/tools/libfsimage/ufs/Makefile
@@ -1,4 +1,5 @@
 XEN_ROOT = $(CURDIR)/../../..
+include $(XEN_ROOT)/tools/libfsimage/Rules.mk
 
 LIB_SRCS-y = fsys_ufs.c
 
@@ -9,5 +10,3 @@ all: fs-all
 
 .PHONY: install
 install: fs-install
-
-include $(XEN_ROOT)/tools/libfsimage/Rules.mk

diff --git a/tools/libfsimage/xfs/Makefile b/tools/libfsimage/xfs/Makefile
index 65800074044962ff06e658bc8608a2a3bd9b3089..ce39ce5b241cf77adadc621b4a08dcd9a58cc4fe 100644 (file)
--- a/tools/libfsimage/xfs/Makefile
+++ b/tools/libfsimage/xfs/Makefile
@@ -1,4 +1,5 @@
 XEN_ROOT = $(CURDIR)/../../..
+include $(XEN_ROOT)/tools/libfsimage/Rules.mk
 
 LIB_SRCS-y = fsys_xfs.c
 
@@ -9,5 +10,3 @@ all: fs-all
 
 .PHONY: install
 install: fs-install
-
-include $(XEN_ROOT)/tools/libfsimage/Rules.mk

diff --git a/tools/libfsimage/zfs/Makefile b/tools/libfsimage/zfs/Makefile
index 9fb0aabe78bd5cf293d32c69b779e1d9d50fc563..89a5e6e0248f50126afbdc18c1f8c5e38101a20e 100644 (file)
--- a/tools/libfsimage/zfs/Makefile
+++ b/tools/libfsimage/zfs/Makefile
@@ -23,6 +23,7 @@
 #
 
 XEN_ROOT = $(CURDIR)/../../..
+include $(XEN_ROOT)/tools/libfsimage/Rules.mk
 
 CFLAGS += -DFSYS_ZFS -DFSIMAGE -I$(XEN_ROOT)/tools/libfsimage/zfs
 LIB_SRCS-y = zfs_lzjb.c zfs_sha256.c zfs_fletcher.c fsi_zfs.c fsys_zfs.c
@@ -34,5 +35,3 @@ all: fs-all
 
 .PHONY: install
 install: fs-install
-
-include $(XEN_ROOT)/tools/libfsimage/Rules.mk