[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-devel] [PATCH v2 4/7] tools: replace private INCLUDEDIR with automake includedir

Reuse automake variable instead of inventing a private variable.

The result of this command:
 git grep -wnl INCLUDEDIR | xargs sed -i 's@INCLUDEDIR@includedir@g'

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Cc: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
Cc: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 config/Paths.mk.in                |  1 -
 tools/Makefile                    | 14 +++++++-------
 tools/blktap2/include/Makefile    |  2 +-
 tools/include/Makefile            | 40 +++++++++++++++++++--------------------
 tools/libfsimage/common/Makefile  |  8 ++++----
 tools/libvchan/Makefile           |  4 ++--
 tools/libxc/Makefile              |  6 +++---
 tools/libxl/Makefile              |  4 ++--
 tools/xenstat/libxenstat/Makefile |  2 +-
 tools/xenstore/Makefile           | 16 ++++++++--------
 10 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/config/Paths.mk.in b/config/Paths.mk.in
index bf9bd51..32f7c78 100644
--- a/config/Paths.mk.in
+++ b/config/Paths.mk.in
@@ -34,7 +34,6 @@ LIBEXEC_BIN              := @LIBEXEC_BIN@
 LIBEXEC_LIB              := $(LIBEXEC)/lib
 LIBEXEC_INC              := $(LIBEXEC)/include
 
-INCLUDEDIR               := $(includedir)
 SHAREDIR                 := @SHAREDIR@
 MANDIR                   := $(mandir)
 MAN1DIR                  := $(MANDIR)/man1
diff --git a/tools/Makefile b/tools/Makefile
index b05d12a..1e0c0a7 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -82,13 +82,13 @@ uninstall:
        rm -rf $(D)$(bindir)/xenstore* $(D)$(bindir)/xentrace*
        rm -rf $(D)$(bindir)/xen-detect $(D)$(bindir)/xencons
        rm -rf $(D)$(bindir)/xenpvnetboot $(D)$(bindir)/qemu-*-xen
-       rm -rf $(D)$(INCLUDEDIR)/xenctrl* $(D)$(INCLUDEDIR)/xenguest.h
-       rm -rf $(D)$(INCLUDEDIR)/xs_lib.h $(D)$(INCLUDEDIR)/xs.h
-       rm -rf $(D)$(INCLUDEDIR)/xenstore-compat/xs_lib.h 
$(D)$(INCLUDEDIR)/xenstore-compat/xs.h
-       rm -rf $(D)$(INCLUDEDIR)/xenstore_lib.h $(D)$(INCLUDEDIR)/xenstore.h
-       rm -rf $(D)$(INCLUDEDIR)/xen
-       rm -rf $(D)$(INCLUDEDIR)/_libxl* $(D)$(INCLUDEDIR)/libxl*
-       rm -rf $(D)$(INCLUDEDIR)/xenstat.h $(D)$(INCLUDEDIR)/xentoollog.h
+       rm -rf $(D)$(includedir)/xenctrl* $(D)$(includedir)/xenguest.h
+       rm -rf $(D)$(includedir)/xs_lib.h $(D)$(includedir)/xs.h
+       rm -rf $(D)$(includedir)/xenstore-compat/xs_lib.h 
$(D)$(includedir)/xenstore-compat/xs.h
+       rm -rf $(D)$(includedir)/xenstore_lib.h $(D)$(includedir)/xenstore.h
+       rm -rf $(D)$(includedir)/xen
+       rm -rf $(D)$(includedir)/_libxl* $(D)$(includedir)/libxl*
+       rm -rf $(D)$(includedir)/xenstat.h $(D)$(includedir)/xentoollog.h
        rm -rf $(D)$(LIBDIR)/libxenctrl* $(D)$(LIBDIR)/libxenguest*
        rm -rf $(D)$(LIBDIR)/libxenstore* $(D)$(LIBDIR)/libxlutil*
        rm -rf $(D)$(LIBDIR)/python/xen $(D)$(LIBDIR)/python/grub
diff --git a/tools/blktap2/include/Makefile b/tools/blktap2/include/Makefile
index c238486..66e8a1e 100644
--- a/tools/blktap2/include/Makefile
+++ b/tools/blktap2/include/Makefile
@@ -6,7 +6,7 @@ all:
 
 .PHONY: install
 install:
-       $(INSTALL_DIR) -p $(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL_DIR) -p $(DESTDIR)$(includedir)
 
 
 .PHONY: clean
diff --git a/tools/include/Makefile b/tools/include/Makefile
index 601f79c..3cd157a 100644
--- a/tools/include/Makefile
+++ b/tools/include/Makefile
@@ -21,29 +21,29 @@ xen/.dir:
 
 .PHONY: install
 install: all
-       $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86
-       $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86/hvm
-       $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm
-       $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm/hvm
-       $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/foreign
-       $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/hvm
-       $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/io
-       $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/sys
-       $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/xsm
-       $(INSTALL_DATA) xen/COPYING $(DESTDIR)$(INCLUDEDIR)/xen
-       $(INSTALL_DATA) xen/*.h $(DESTDIR)$(INCLUDEDIR)/xen
-       $(INSTALL_DATA) xen/arch-x86/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86
-       $(INSTALL_DATA) xen/arch-x86/hvm/*.h 
$(DESTDIR)$(INCLUDEDIR)/xen/arch-x86/hvm
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/arch-x86
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/arch-x86/hvm
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/arch-arm
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/arch-arm/hvm
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/foreign
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/hvm
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/io
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/sys
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/xsm
+       $(INSTALL_DATA) xen/COPYING $(DESTDIR)$(includedir)/xen
+       $(INSTALL_DATA) xen/*.h $(DESTDIR)$(includedir)/xen
+       $(INSTALL_DATA) xen/arch-x86/*.h $(DESTDIR)$(includedir)/xen/arch-x86
+       $(INSTALL_DATA) xen/arch-x86/hvm/*.h 
$(DESTDIR)$(includedir)/xen/arch-x86/hvm
 
 #      xen/arch-arm doesn't contains headers for now. Uncommented the line
 #      as soon as a new header is added
-#      $(INSTALL_DATA) xen/arch-arm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm
-       $(INSTALL_DATA) xen/arch-arm/hvm/*.h 
$(DESTDIR)$(INCLUDEDIR)/xen/arch-arm/hvm
-       $(INSTALL_DATA) xen/foreign/*.h $(DESTDIR)$(INCLUDEDIR)/xen/foreign
-       $(INSTALL_DATA) xen/hvm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/hvm
-       $(INSTALL_DATA) xen/io/*.h $(DESTDIR)$(INCLUDEDIR)/xen/io
-       $(INSTALL_DATA) xen/sys/*.h $(DESTDIR)$(INCLUDEDIR)/xen/sys
-       $(INSTALL_DATA) xen/xsm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/xsm
+#      $(INSTALL_DATA) xen/arch-arm/*.h $(DESTDIR)$(includedir)/xen/arch-arm
+       $(INSTALL_DATA) xen/arch-arm/hvm/*.h 
$(DESTDIR)$(includedir)/xen/arch-arm/hvm
+       $(INSTALL_DATA) xen/foreign/*.h $(DESTDIR)$(includedir)/xen/foreign
+       $(INSTALL_DATA) xen/hvm/*.h $(DESTDIR)$(includedir)/xen/hvm
+       $(INSTALL_DATA) xen/io/*.h $(DESTDIR)$(includedir)/xen/io
+       $(INSTALL_DATA) xen/sys/*.h $(DESTDIR)$(includedir)/xen/sys
+       $(INSTALL_DATA) xen/xsm/*.h $(DESTDIR)$(includedir)/xen/xsm
 
 .PHONY: clean
 clean:
diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
index fb306f4..a70219f 100644
--- a/tools/libfsimage/common/Makefile
+++ b/tools/libfsimage/common/Makefile
@@ -23,13 +23,13 @@ all: $(LIB)
 .PHONY: install
 install: all
        $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
-       $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)
        $(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
        ln -sf libfsimage.so.$(MAJOR).$(MINOR) 
$(DESTDIR)$(LIBDIR)/libfsimage.so.$(MAJOR)
        ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libfsimage.so
-       $(INSTALL_DATA) fsimage.h $(DESTDIR)$(INCLUDEDIR)
-       $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(INCLUDEDIR)
-       $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL_DATA) fsimage.h $(DESTDIR)$(includedir)
+       $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(includedir)
+       $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(includedir)
 
 clean distclean::
        rm -f $(LIB)
diff --git a/tools/libvchan/Makefile b/tools/libvchan/Makefile
index d768df4..3ce7c10 100644
--- a/tools/libvchan/Makefile
+++ b/tools/libvchan/Makefile
@@ -43,11 +43,11 @@ vchan-node2: $(NODE2_OBJS) libxenvchan.so
 .PHONY: install
 install: all
        $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
-       $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)
        $(INSTALL_PROG) libxenvchan.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
        ln -sf libxenvchan.so.$(MAJOR).$(MINOR) 
$(DESTDIR)$(LIBDIR)/libxenvchan.so.$(MAJOR)
        ln -sf libxenvchan.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenvchan.so
-       $(INSTALL_DATA) libxenvchan.h $(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL_DATA) libxenvchan.h $(DESTDIR)$(includedir)
        $(INSTALL_DATA) libxenvchan.a $(DESTDIR)$(LIBDIR)
 
 .PHONY: clean
diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 63878ec..f686f41 100644
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -163,17 +163,17 @@ libs: $(LIB)
 .PHONY: install
 install: build
        $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
-       $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)
        $(INSTALL_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
        $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(LIBDIR)
        $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) 
$(DESTDIR)$(LIBDIR)/libxenctrl.so.$(MAJOR)
        $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR) 
$(DESTDIR)$(LIBDIR)/libxenctrl.so
-       $(INSTALL_DATA) include/xenctrl.h include/xenctrlosdep.h 
include/xentoollog.h $(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL_DATA) include/xenctrl.h include/xenctrlosdep.h 
include/xentoollog.h $(DESTDIR)$(includedir)
        $(INSTALL_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
        $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR)
        $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) 
$(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR)
        $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR) 
$(DESTDIR)$(LIBDIR)/libxenguest.so
-       $(INSTALL_DATA) include/xenguest.h $(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL_DATA) include/xenguest.h $(DESTDIR)$(includedir)
 
 .PHONY: TAGS
 TAGS:
diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index ef8b407..d957d4b 100644
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -258,7 +258,7 @@ $(PKG_CONFIG): % : %.in Makefile
 install: all
        $(INSTALL_DIR) $(DESTDIR)$(sbindir)
        $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
-       $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)
        $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR)
        $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
        $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/pkgconfig
@@ -273,7 +273,7 @@ install: all
        $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) 
$(DESTDIR)$(LIBDIR)/libxlutil.so.$(XLUMAJOR)
        $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR) 
$(DESTDIR)$(LIBDIR)/libxlutil.so
        $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(LIBDIR)
-       $(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h 
_libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h libxlutil.h 
$(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h 
_libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h libxlutil.h 
$(DESTDIR)$(includedir)
        $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh
        $(INSTALL_DATA) xenlight.pc $(DESTDIR)$(SHAREDIR)/pkgconfig/
        $(INSTALL_DATA) xlutil.pc $(DESTDIR)$(SHAREDIR)/pkgconfig/
diff --git a/tools/xenstat/libxenstat/Makefile 
b/tools/xenstat/libxenstat/Makefile
index 7c973f8..3b58147 100644
--- a/tools/xenstat/libxenstat/Makefile
+++ b/tools/xenstat/libxenstat/Makefile
@@ -56,7 +56,7 @@ src/libxenstat.so: src/libxenstat.so.$(MAJOR)
 
 .PHONY: install
 install: all
-       $(INSTALL_DATA) src/xenstat.h $(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL_DATA) src/xenstat.h $(DESTDIR)$(includedir)
        $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)/libxenstat.a
        $(INSTALL_PROG) src/libxenstat.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
        ln -sf libxenstat.so.$(MAJOR).$(MINOR) 
$(DESTDIR)$(LIBDIR)/libxenstat.so.$(MAJOR)
diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index a809d74..4aec1f8 100644
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -129,8 +129,8 @@ tarball: clean
 .PHONY: install
 install: all
        $(INSTALL_DIR) $(DESTDIR)$(bindir)
-       $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
-       $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xenstore-compat
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)/xenstore-compat
 ifeq ($(XENSTORE_XENSTORED),y)
        $(INSTALL_DIR) $(DESTDIR)$(sbindir)
        $(INSTALL_DIR) $(DESTDIR)$(XEN_LIB_STORED)
@@ -146,12 +146,12 @@ endif
        ln -sf libxenstore.so.$(MAJOR).$(MINOR) 
$(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR)
        ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstore.so
        $(INSTALL_DATA) libxenstore.a $(DESTDIR)$(LIBDIR)
-       $(INSTALL_DATA) include/xenstore.h $(DESTDIR)$(INCLUDEDIR)
-       $(INSTALL_DATA) include/xenstore_lib.h $(DESTDIR)$(INCLUDEDIR)
-       $(INSTALL_DATA) include/compat/xs.h 
$(DESTDIR)$(INCLUDEDIR)/xenstore-compat/xs.h
-       $(INSTALL_DATA) include/compat/xs_lib.h 
$(DESTDIR)$(INCLUDEDIR)/xenstore-compat/xs_lib.h
-       ln -sf xenstore-compat/xs.h  $(DESTDIR)$(INCLUDEDIR)/xs.h
-       ln -sf xenstore-compat/xs_lib.h $(DESTDIR)$(INCLUDEDIR)/xs_lib.h
+       $(INSTALL_DATA) include/xenstore.h $(DESTDIR)$(includedir)
+       $(INSTALL_DATA) include/xenstore_lib.h $(DESTDIR)$(includedir)
+       $(INSTALL_DATA) include/compat/xs.h 
$(DESTDIR)$(includedir)/xenstore-compat/xs.h
+       $(INSTALL_DATA) include/compat/xs_lib.h 
$(DESTDIR)$(includedir)/xenstore-compat/xs_lib.h
+       ln -sf xenstore-compat/xs.h  $(DESTDIR)$(includedir)/xs.h
+       ln -sf xenstore-compat/xs_lib.h $(DESTDIR)$(includedir)/xs_lib.h
 
 .PHONY: clients-install
 clients-install: clients

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel

 

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.

Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.