Browse Source

- remove libs-static handling; static dir can be removed

master
vanhofen 2 years ago
parent
commit
7c6cfcae91
  1. 1
      Makefile
  2. 7
      make/buildsystem-bootstrap.mk
  3. 10
      make/buildsystem-clean.mk
  4. 4
      make/environment-build.mk
  5. 17
      make/target-libs-static.mk

1
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

7
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) \

10
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

4
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

17
make/target-libs-static.mk

@ -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
Loading…
Cancel
Save