topaLE
/
ni-buildsystem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

- rename STATICLIB => STATIC_LIB_DIR

master
vanhofen 7 years ago
parent
bda3051de4
commit
57e67d1246
3 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      make/bootstrap.mk
  2. 4
      make/environment.mk
  3. 4
      make/static.mk

4
make/bootstrap.mk
View File

@ -8,7 +8,7 @@ ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51))
endif endif
PLAT_INCS = $(TARGETLIB)/firmware PLAT_INCS = $(TARGETLIB)/firmware
PLAT_LIBS = $(TARGETLIB) $(STATICLIB) PLAT_LIBS = $(TARGETLIB) $(STATIC_LIB_DIR)
bootstrap: $(BOOTSTRAP) bootstrap: $(BOOTSTRAP)
@echo -e "$(TERM_YELLOW)Bootstrapped for $(shell echo $(BOXTYPE) | sed 's/.*/\u&/') $(BOXMODEL)$(TERM_NORMAL)" @echo -e "$(TERM_YELLOW)Bootstrapped for $(shell echo $(BOXTYPE) | sed 's/.*/\u&/') $(BOXMODEL)$(TERM_NORMAL)"
@ -48,7 +48,7 @@ $(HOST_DIR):
$(HOST_DIR)/bin: $(HOST_DIR) $(HOST_DIR)/bin: $(HOST_DIR)
mkdir -p $@ mkdir -p $@
$(STATICLIB): $(STATIC_LIB_DIR):
mkdir -p $@ mkdir -p $@
$(TARGETLIB)/firmware: | $(TARGET_DIR) $(TARGETLIB)/firmware: | $(TARGET_DIR)

4
make/environment.mk
View File

@ -153,7 +153,7 @@ PATCHES = $(BASE_DIR)/archive-patches
IMAGEFILES = $(BASE_DIR)/archive-imagefiles IMAGEFILES = $(BASE_DIR)/archive-imagefiles
SOURCES = $(BASE_DIR)/archive-sources SOURCES = $(BASE_DIR)/archive-sources
SKEL_ROOT = $(BASE_DIR)/skel-root/$(BOXTYPE)/$(BOXSERIES) SKEL_ROOT = $(BASE_DIR)/skel-root/$(BOXTYPE)/$(BOXSERIES)
STATICLIB = $(STATIC_DIR)/lib STATIC_LIB_DIR = $(STATIC_DIR)/lib
TARGETLIB = $(TARGET_DIR)/lib TARGETLIB = $(TARGET_DIR)/lib
TARGETINCLUDE = $(TARGET_DIR)/include TARGETINCLUDE = $(TARGET_DIR)/include
BUILD ?= $(shell /usr/share/libtool/config.guess 2>/dev/null || /usr/share/libtool/config/config.guess 2>/dev/null || /usr/share/misc/config.guess) BUILD ?= $(shell /usr/share/libtool/config.guess 2>/dev/null || /usr/share/libtool/config/config.guess 2>/dev/null || /usr/share/misc/config.guess)
@ -255,7 +255,7 @@ PKG_CONFIG_PATH = $(PKG_CONFIG_LIBDIR)/pkgconfig
# helper-"functions": # helper-"functions":
REWRITE_LIBTOOL = sed -i "s,^libdir=.*,libdir='$(TARGETLIB)'," $(TARGETLIB) REWRITE_LIBTOOL = sed -i "s,^libdir=.*,libdir='$(TARGETLIB)'," $(TARGETLIB)
REWRITE_LIBTOOL_STATIC = sed -i "s,^libdir=.*,libdir='$(TARGETLIB)'," $(STATICLIB) REWRITE_LIBTOOL_STATIC = sed -i "s,^libdir=.*,libdir='$(TARGETLIB)'," $(STATIC_LIB_DIR)
REWRITE_LIBTOOLDEP = sed -i -e "s,\(^dependency_libs='\| \|-L\|^dependency_libs='\)/lib,\ $(TARGETLIB),g" $(TARGETLIB) REWRITE_LIBTOOLDEP = sed -i -e "s,\(^dependency_libs='\| \|-L\|^dependency_libs='\)/lib,\ $(TARGETLIB),g" $(TARGETLIB)
REWRITE_PKGCONF = sed -i "s,^prefix=.*,prefix='$(TARGET_DIR)'," REWRITE_PKGCONF = sed -i "s,^prefix=.*,prefix='$(TARGET_DIR)',"

4
make/static.mk
View File

@ -7,8 +7,8 @@ ifneq ($(BOXSERIES), hd51)
CORTEX-STRINGS_CONF = --without-neon CORTEX-STRINGS_CONF = --without-neon
endif endif
cortex-strings: $(STATICLIB)/libcortex-strings.la cortex-strings: $(STATIC_LIB_DIR)/libcortex-strings.la
$(STATICLIB)/libcortex-strings.la: $(ARCHIVE)/cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2 | $(TARGET_DIR) $(STATIC_LIB_DIR)/libcortex-strings.la: $(ARCHIVE)/cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2 | $(TARGET_DIR)
$(UNTAR)/cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2 $(UNTAR)/cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2
pushd $(BUILD_TMP)/cortex-strings-$(CORTEX-STRINGS_VER) && \ pushd $(BUILD_TMP)/cortex-strings-$(CORTEX-STRINGS_VER) && \
./autogen.sh && \ ./autogen.sh && \

Write Preview
Loading…
Cancel
Save