diff --git a/repos/dde_linux/lib/import/import-usb_host_include.mk b/repos/dde_linux/lib/import/import-usb_host_include.mk deleted file mode 100644 index a1686ef752..0000000000 --- a/repos/dde_linux/lib/import/import-usb_host_include.mk +++ /dev/null @@ -1,13 +0,0 @@ -USB_CONTRIB_DIR := $(call select_from_ports,dde_linux)/src/drivers/usb_host - -include $(call select_from_repositories,lib/import/import-usb_arch_include.mk) - -# -# The order of include-search directories is important, we need to look into -# 'contrib' before falling back to our custom 'lx_emul.h' header. -# -INC_DIR += $(ARCH_SRC_INC_DIR) -INC_DIR += $(USB_CONTRIB_DIR)/include -INC_DIR += $(USB_CONTRIB_DIR)/include/uapi -INC_DIR += $(USB_CONTRIB_DIR)/drivers/usb/core -INC_DIR += $(LIB_CACHE_DIR)/usb_host_include/include/include/include diff --git a/repos/dde_linux/lib/mk/usb_host_include.mk b/repos/dde_linux/lib/mk/usb_host_include.mk deleted file mode 100644 index 5529a1db85..0000000000 --- a/repos/dde_linux/lib/mk/usb_host_include.mk +++ /dev/null @@ -1,37 +0,0 @@ -ifeq ($(called_from_lib_mk),yes) - -USB_CONTRIB_DIR := $(call select_from_ports,dde_linux)/src/drivers/usb_host -LX_EMUL_H := $(REP_DIR)/src/drivers/usb_host/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'. -# -SCAN_DIRS := $(addprefix $(USB_CONTRIB_DIR)/include/, asm-generic linux uapi) \ - $(addprefix $(USB_CONTRIB_DIR)/, drivers lib) -GEN_INCLUDES := $(shell grep -rIh "^\# *include .*\/" $(SCAN_DIRS) |\ - sed "s/^\# *include [^<\"]*[<\"]\([^>\"]*\)[>\"].*/\1/" |\ - sort | uniq) -# -# Filter out original Linux headers that exist in the contrib directory -# -NO_GEN_INCLUDES := $(shell cd $(USB_CONTRIB_DIR)/; find include -name "*.h" |\ - sed "s/.\///" | sed "s/.*include\///") -GEN_INCLUDES := $(filter-out $(NO_GEN_INCLUDES),$(GEN_INCLUDES)) - -# -# Put Linux headers in 'GEN_INC' dir, since some include use "../../" paths use -# three level include hierarchy -# -GEN_INC := $(shell pwd)/include/include/include -GEN_INCLUDES := $(addprefix $(GEN_INC)/,$(GEN_INCLUDES)) - -all: $(GEN_INCLUDES) - -$(GEN_INCLUDES): - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)ln -s $(LX_EMUL_H) $@ - -endif - -CC_CXX_WARN_STRICT =