# HG changeset patch # User Olaf Hering <olaf@aepfle.de> # Date 1331744036 -3600 # Node ID be592e236da2518020f0772200d8e39a0de74986 # Parent 773d0367087212c43faf8cdcc21cf443b1ea0046 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> diff -r 773d03670872 -r be592e236da2 tools/libfsimage/ext2fs-lib/Makefile --- 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 -r 773d03670872 -r be592e236da2 tools/libfsimage/ext2fs/Makefile --- 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 -r 773d03670872 -r be592e236da2 tools/libfsimage/fat/Makefile --- 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 -r 773d03670872 -r be592e236da2 tools/libfsimage/iso9660/Makefile --- 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 -r 773d03670872 -r be592e236da2 tools/libfsimage/reiserfs/Makefile --- 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 -r 773d03670872 -r be592e236da2 tools/libfsimage/ufs/Makefile --- 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 -r 773d03670872 -r be592e236da2 tools/libfsimage/xfs/Makefile --- 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 -r 773d03670872 -r be592e236da2 tools/libfsimage/zfs/Makefile --- 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