[Xen-changelog] [xen-unstable] tools/libfsimage: include Rules.mk first

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Olaf Hering <olaf@xxxxxxxxx>
# Date 1331744036 -3600
# Node ID b490ef93bad7b932942fb87f2f7bd96442cf3d03
# Parent  061ef27b6569828c51849b5a63d4f4e311895825
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@xxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
---


diff -r 061ef27b6569 -r b490ef93bad7 tools/libfsimage/ext2fs-lib/Makefile
--- a/tools/libfsimage/ext2fs-lib/Makefile      Wed Mar 14 17:02:23 2012 +0100
+++ b/tools/libfsimage/ext2fs-lib/Makefile      Wed Mar 14 17:53:56 2012 +0100
@@ -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 -r 061ef27b6569 -r b490ef93bad7 tools/libfsimage/ext2fs/Makefile
--- a/tools/libfsimage/ext2fs/Makefile  Wed Mar 14 17:02:23 2012 +0100
+++ b/tools/libfsimage/ext2fs/Makefile  Wed Mar 14 17:53:56 2012 +0100
@@ -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 -r 061ef27b6569 -r b490ef93bad7 tools/libfsimage/fat/Makefile
--- a/tools/libfsimage/fat/Makefile     Wed Mar 14 17:02:23 2012 +0100
+++ b/tools/libfsimage/fat/Makefile     Wed Mar 14 17:53:56 2012 +0100
@@ -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 -r 061ef27b6569 -r b490ef93bad7 tools/libfsimage/iso9660/Makefile
--- a/tools/libfsimage/iso9660/Makefile Wed Mar 14 17:02:23 2012 +0100
+++ b/tools/libfsimage/iso9660/Makefile Wed Mar 14 17:53:56 2012 +0100
@@ -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 -r 061ef27b6569 -r b490ef93bad7 tools/libfsimage/reiserfs/Makefile
--- a/tools/libfsimage/reiserfs/Makefile        Wed Mar 14 17:02:23 2012 +0100
+++ b/tools/libfsimage/reiserfs/Makefile        Wed Mar 14 17:53:56 2012 +0100
@@ -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 -r 061ef27b6569 -r b490ef93bad7 tools/libfsimage/ufs/Makefile
--- a/tools/libfsimage/ufs/Makefile     Wed Mar 14 17:02:23 2012 +0100
+++ b/tools/libfsimage/ufs/Makefile     Wed Mar 14 17:53:56 2012 +0100
@@ -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 -r 061ef27b6569 -r b490ef93bad7 tools/libfsimage/xfs/Makefile
--- a/tools/libfsimage/xfs/Makefile     Wed Mar 14 17:02:23 2012 +0100
+++ b/tools/libfsimage/xfs/Makefile     Wed Mar 14 17:53:56 2012 +0100
@@ -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 -r 061ef27b6569 -r b490ef93bad7 tools/libfsimage/zfs/Makefile
--- a/tools/libfsimage/zfs/Makefile     Wed Mar 14 17:02:23 2012 +0100
+++ b/tools/libfsimage/zfs/Makefile     Wed Mar 14 17:53:56 2012 +0100
@@ -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

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog