From eda0828ca05fa03140a40eca142f1509d6043808 Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Sat, 11 Feb 2017 16:44:04 +0100 Subject: [PATCH] Skip binary files in GEN_INCLUDES A binary file may be a temporary Vim .swp file when examining contrib sources. The commit prevents build errors like .../repos/dde_linux/lib/mk/lxip_include.mk:29: target '.../x86_64/var/libcache/lxip_include/include/include/include/Binary' given more than once in the same rule .../repos/dde_linux/lib/mk/lxip_include.mk:29: target '.../x86_64/var/libcache/lxip_include/include/include/include/file' given more than once in the same rule ... --- repos/dde_bsd/lib/mk/dde_bsd_audio_include.mk | 2 +- repos/dde_linux/lib/mk/lxip_include.mk | 2 +- repos/dde_linux/lib/mk/spec/x86/intel_fb_include.mk | 2 +- repos/dde_linux/lib/mk/usb_include.mk | 2 +- repos/dde_linux/lib/mk/wifi_include.mk | 2 +- repos/libports/lib/mk/qemu-usb_include.mk | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/repos/dde_bsd/lib/mk/dde_bsd_audio_include.mk b/repos/dde_bsd/lib/mk/dde_bsd_audio_include.mk index 874249e4ca..fe716a1002 100644 --- a/repos/dde_bsd/lib/mk/dde_bsd_audio_include.mk +++ b/repos/dde_bsd/lib/mk/dde_bsd_audio_include.mk @@ -9,7 +9,7 @@ ifeq ($(called_from_lib_mk),yes) BSD_CONTRIB_DIR := $(call select_from_ports,dde_bsd)/src/lib/audio BSD_EMUL_H := $(REP_DIR)/src/lib/audio/include/bsd_emul.h -GEN_INCLUDES := $(shell grep -rh "^\#include .*" $(BSD_CONTRIB_DIR) |\ +GEN_INCLUDES := $(shell grep -rIh "^\#include .*" $(BSD_CONTRIB_DIR) |\ sed "s/^\#include [^<\"]*[<\"]\([^>\"]*\)[>\"].*/\1/" | sort | uniq) GEN_INC := $(shell pwd)/include diff --git a/repos/dde_linux/lib/mk/lxip_include.mk b/repos/dde_linux/lib/mk/lxip_include.mk index bf88421094..2e4a689a30 100644 --- a/repos/dde_linux/lib/mk/lxip_include.mk +++ b/repos/dde_linux/lib/mk/lxip_include.mk @@ -7,7 +7,7 @@ LX_EMUL_H := $(REP_DIR)/src/lib/lxip/include/lx_emul.h # Determine the header files included by the contrib code. For each # of these header files we create a symlink to 'lx_emul.h'. # -GEN_INCLUDES := $(shell grep -rh "^\#include" $(LXIP_CONTRIB_DIR) |\ +GEN_INCLUDES := $(shell grep -rIh "^\#include" $(LXIP_CONTRIB_DIR) |\ sed "s/^\#include [^<\"]*[<\"]\([^>\"]*\)[>\"].*/\1/" |\ sort | uniq) # diff --git a/repos/dde_linux/lib/mk/spec/x86/intel_fb_include.mk b/repos/dde_linux/lib/mk/spec/x86/intel_fb_include.mk index 77001c70eb..d60168cb41 100644 --- a/repos/dde_linux/lib/mk/spec/x86/intel_fb_include.mk +++ b/repos/dde_linux/lib/mk/spec/x86/intel_fb_include.mk @@ -9,7 +9,7 @@ ifeq ($(called_from_lib_mk),yes) LX_CONTRIB_DIR := $(call select_from_ports,dde_linux)/src/drivers/framebuffer/intel LX_EMUL_H := $(REP_DIR)/src/drivers/framebuffer/intel/include/lx_emul.h -GEN_INCLUDES := $(shell grep -rh "^\#include .*" $(LX_CONTRIB_DIR) |\ +GEN_INCLUDES := $(shell grep -rIh "^\#include .*" $(LX_CONTRIB_DIR) |\ sed "s/^\#include [^<\"]*[<\"]\([^>\"]*\)[>\"].*/\1/" | sort | uniq) # diff --git a/repos/dde_linux/lib/mk/usb_include.mk b/repos/dde_linux/lib/mk/usb_include.mk index 51951924e0..821e08361c 100644 --- a/repos/dde_linux/lib/mk/usb_include.mk +++ b/repos/dde_linux/lib/mk/usb_include.mk @@ -7,7 +7,7 @@ LX_EMUL_H := $(REP_DIR)/src/lib/usb/include/lx_emul.h # Determine the header files included by the contrib code. For each # of these header files we create a symlink to 'lx_emul.h'. # -GEN_INCLUDES := $(shell grep -rh "^\#include .*\/" $(USB_CONTRIB_DIR) |\ +GEN_INCLUDES := $(shell grep -rIh "^\#include .*\/" $(USB_CONTRIB_DIR) |\ sed "s/^\#include [^<\"]*[<\"]\([^>\"]*\)[>\"].*/\1/" |\ sort | uniq) # diff --git a/repos/dde_linux/lib/mk/wifi_include.mk b/repos/dde_linux/lib/mk/wifi_include.mk index 8612f5354f..d1b616be36 100644 --- a/repos/dde_linux/lib/mk/wifi_include.mk +++ b/repos/dde_linux/lib/mk/wifi_include.mk @@ -7,7 +7,7 @@ LX_EMUL_H := $(REP_DIR)/src/lib/wifi/include/lx_emul.h # Determine the header files included by the contrib code. For each # of these header files we create a symlink to 'lx_emul.h'. # -GEN_INCLUDES := $(shell grep -rh "^\#include .*\/" $(WIFI_CONTRIB_DIR) |\ +GEN_INCLUDES := $(shell grep -rIh "^\#include .*\/" $(WIFI_CONTRIB_DIR) |\ sed "s/^\#include [^<\"]*[<\"]\([^>\"]*\)[>\"].*/\1/" |\ sort | uniq) # diff --git a/repos/libports/lib/mk/qemu-usb_include.mk b/repos/libports/lib/mk/qemu-usb_include.mk index ab3e0d1cd2..014dccc4bf 100644 --- a/repos/libports/lib/mk/qemu-usb_include.mk +++ b/repos/libports/lib/mk/qemu-usb_include.mk @@ -7,7 +7,7 @@ QEMU_EMUL_H := $(REP_DIR)/src/lib/qemu-usb/include/qemu_emul.h # Determine the header files included by the contrib code. For each # of these header files we create a symlink to 'qemu_emul.h'. # -GEN_INCLUDES := $(shell grep -rh "^\#include .*" $(QEMU_CONTRIB_DIR) |\ +GEN_INCLUDES := $(shell grep -rIh "^\#include .*" $(QEMU_CONTRIB_DIR) |\ sed "s/^\#include [^<\"]*[<\"]\([^>\"]*\)[>\"].*/\1/" | sort | uniq) # # Put Qemu headers in 'GEN_INC' dir