diff --git a/Makefile b/Makefile index e421b840..122e2945 100755 --- a/Makefile +++ b/Makefile @@ -218,7 +218,6 @@ include make/flash-updates.mk include make/flash-images.mk include make/linux-kernel.mk include make/target-blobs.mk -include make/target-libs-static.mk include make/target-rootfs.mk include make/host-tools.mk diff --git a/make/buildsystem-bootstrap.mk b/make/buildsystem-bootstrap.mk index 0e7d9d58..25b30b79 100644 --- a/make/buildsystem-bootstrap.mk +++ b/make/buildsystem-bootstrap.mk @@ -5,7 +5,6 @@ # buildsystem related BOOTSTRAP = $(CROSS_DIR) -BOOTSTRAP += $(STATIC_DIR) BOOTSTRAP += $(DEPS_DIR) BOOTSTRAP += $(BUILD_DIR) BOOTSTRAP += $(STAGING_DIR) @@ -15,9 +14,12 @@ BOOTSTRAP += host-tools # target related BOOTSTRAP += target-dir -BOOTSTRAP += libs-static BOOTSTRAP += libs-cross +ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd2)) + BOOTSTRAP += cortex-strings +endif + ifeq ($(BOXTYPE),$(filter $(BOXTYPE),coolstream)) BOOTSTRAP += var-update endif @@ -80,7 +82,6 @@ $(TARGET_DIR): # ----------------------------------------------------------------------------- -$(STATIC_DIR) \ $(DEPS_DIR) \ $(BUILD_DIR) \ $(STAGING_DIR) \ diff --git a/make/buildsystem-clean.mk b/make/buildsystem-clean.mk index 18ff4a4e..29dad95f 100644 --- a/make/buildsystem-clean.mk +++ b/make/buildsystem-clean.mk @@ -24,12 +24,6 @@ host-bin-config-clean: staging-clean: -rm -rf $(STAGING_DIR) -static-base-clean: - -rm -rf $(STATIC_BASE) - -static-clean: - -rm -rf $(STATIC_DIR) - target-clean: -rm -rf $(TARGET_DIR) @@ -39,7 +33,7 @@ ccache-clean: rebuild-clean: host-bin-config-clean target-clean deps-clean build-clean checkout-branches -all-clean: rebuild-clean staging-clean host-clean static-base-clean +all-clean: rebuild-clean staging-clean host-clean @$(call WARNING,"Any other key then CTRL-C will now remove CROSS_BASE") @read make cross-base-clean @@ -62,8 +56,6 @@ PHONY += deps-clean PHONY += host-clean PHONY += host-bin-config-clean PHONY += staging-clean -PHONY += static-base-clean -PHONY += static-clean PHONY += target-clean PHONY += ccache-clean PHONY += rebuild-clean diff --git a/make/environment-build.mk b/make/environment-build.mk index 81019a37..e83f5fad 100644 --- a/make/environment-build.mk +++ b/make/environment-build.mk @@ -93,8 +93,6 @@ IMAGE_DIR = $(STAGING_DIR)/images UPDATE_DIR = $(STAGING_DIR)/updates CROSS_BASE = $(BASE_DIR)/cross CROSS_DIR ?= $(CROSS_BASE)/$(TARGET_ARCH)-$(TARGET_OS)-$(KERNEL_VERSION) -STATIC_BASE = $(BASE_DIR)/static -STATIC_DIR = $(STATIC_BASE)/$(TARGET_ARCH)-$(TARGET_OS)-$(KERNEL_VERSION) SKEL_ROOT = $(BASE_DIR)/skel-root/$(BOXSERIES) ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) SKEL_ROOT = $(BASE_DIR)/skel-root/vuplus @@ -110,8 +108,6 @@ MAINTAINER ?= unknown include make/environment-host.mk include make/environment-target.mk -STATIC_libdir = $(STATIC_DIR)/$(prefix)/lib - # ----------------------------------------------------------------------------- HOST_CPPFLAGS = -I$(HOST_DIR)/include diff --git a/make/target-libs-static.mk b/make/target-libs-static.mk deleted file mode 100644 index e6bacc81..00000000 --- a/make/target-libs-static.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# makefile to build static libraries -# -# ----------------------------------------------------------------------------- - -LIBS-STATIC = -ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd2 hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) - LIBS-STATIC += cortex-strings -endif - -libs-static: $(LIBS-STATIC) | $(TARGET_DIR) - $(INSTALL_COPY) $(STATIC_DIR)/. $(TARGET_DIR)/ - $(call REWRITE_LIBTOOL) - -# ----------------------------------------------------------------------------- - -PHONY += libs-static