From a8ce5c380c69539fe0c7c62c397634d9d0c9fde2 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Fri, 18 Dec 2020 18:48:46 +0300 Subject: Switch to build2 --- build/import/libz/configuration-rules.make | 13 ------- build/import/libz/configure | 56 ------------------------------ build/import/libz/rules.make | 27 -------------- build/import/libz/stub.make | 30 ---------------- build/import/libz/version | 1 - 5 files changed, 127 deletions(-) delete mode 100644 build/import/libz/configuration-rules.make delete mode 100755 build/import/libz/configure delete mode 100644 build/import/libz/rules.make delete mode 100644 build/import/libz/stub.make delete mode 100644 build/import/libz/version (limited to 'build/import/libz') diff --git a/build/import/libz/configuration-rules.make b/build/import/libz/configuration-rules.make deleted file mode 100644 index deabba0..0000000 --- a/build/import/libz/configuration-rules.make +++ /dev/null @@ -1,13 +0,0 @@ -# file : build/import/libz/configuration-rules.make -# license : GNU GPL v2; see accompanying LICENSE file - -$(dcf_root)/import/libz/configuration-dynamic.make: | $(dcf_root)/import/libz/. - $(call message,,$(scf_root)/import/libz/configure $@) - -ifndef %foreign% - -disfigure:: - $(call message,rm $(dcf_root)/import/libz/configuration-dynamic.make,\ -rm -f $(dcf_root)/import/libz/configuration-dynamic.make) - -endif diff --git a/build/import/libz/configure b/build/import/libz/configure deleted file mode 100755 index a36fca3..0000000 --- a/build/import/libz/configure +++ /dev/null @@ -1,56 +0,0 @@ -#! /usr/bin/env bash - -# file : build/import/libz/configure -# license : GNU GPL v2; see accompanying LICENSE file - - -# $1 - out config file -# -# bld_root - build root -# project_name - project name -# - -source $bld_root/dialog.bash - - -$echo -$echo "Configuring external dependency on 'zlib' for '$project_name'." -$echo - -$echo -$echo "Would you like to configure dependency on the installed version" -$echo "of 'zlib' as opposed to the development build?" -$echo - -installed=`read_y_n y` - -path= -type= - -if [ "$installed" = "n" ]; then - - $echo - $echo "Please enter the 'zlib' root directory." - $echo - - root=`read_path --directory --exist` - - $echo - $echo "Please select the library type you would like to use:" - $echo - $echo "(1) archive" - $echo "(2) shared object" - $echo - - type=`read_option "archive shared" "shared"` - -fi - -echo libz_installed := $installed >$1 - -if [ "$installed" = "n" ]; then - - echo libz_root := $root >>$1 - echo libz_type := $type >>$1 - -fi diff --git a/build/import/libz/rules.make b/build/import/libz/rules.make deleted file mode 100644 index 5720a5e..0000000 --- a/build/import/libz/rules.make +++ /dev/null @@ -1,27 +0,0 @@ -# file : build/import/libz/rules.make -# license : GNU GPL v2; see accompanying LICENSE file - -$(dcf_root)/import/libz/%: root := $(libz_root) - -ifeq ($(libz_type),archive) - -$(dcf_root)/import/libz/z.l: $(libz_root)/libz.a - @echo $< >$@ -else - -$(dcf_root)/import/libz/z.l: $(libz_root)/libz.so - @echo $< >$@ - @echo rpath:$(root) >>$@ -endif - -$(dcf_root)/import/libz/z.l.cpp-options: - @echo include: -I$(root) >$@ - -ifndef %foreign% - -disfigure:: - $(call message,rm $(dcf_root)/import/libz/z.l,\ -rm -f $(dcf_root)/import/libz/z.l) - $(call message,,rm -f $(dcf_root)/import/libz/z.l.cpp-options) - -endif diff --git a/build/import/libz/stub.make b/build/import/libz/stub.make deleted file mode 100644 index a50f288..0000000 --- a/build/import/libz/stub.make +++ /dev/null @@ -1,30 +0,0 @@ -# file : build/import/libz/stub.make -# license : GNU GPL v2; see accompanying LICENSE file - -$(call include-once,$(scf_root)/import/libz/configuration-rules.make,$(dcf_root)) - -libz_installed := - -$(call -include,$(dcf_root)/import/libz/configuration-dynamic.make) - -ifdef libz_installed - -ifeq ($(libz_installed),y) - -$(call export,l: -lz,cpp-options: ) - -else - -$(call include-once,$(scf_root)/import/libz/rules.make,$(dcf_root)) - -$(call export,\ - l: $(dcf_root)/import/libz/z.l,\ - cpp-options: $(dcf_root)/import/libz/z.l.cpp-options) - -endif - -else - -.NOTPARALLEL: - -endif diff --git a/build/import/libz/version b/build/import/libz/version deleted file mode 100644 index 6e8bf73..0000000 --- a/build/import/libz/version +++ /dev/null @@ -1 +0,0 @@ -0.1.0 -- cgit v1.1