From 5e527213a2430bb3018e5eebd909aef294edf9b5 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/libace/configuration-rules.make | 13 ------- build/import/libace/configure | 56 ---------------------------- build/import/libace/rules.make | 27 -------------- build/import/libace/stub.make | 30 --------------- build/import/libace/version | 1 - 5 files changed, 127 deletions(-) delete mode 100644 build/import/libace/configuration-rules.make delete mode 100755 build/import/libace/configure delete mode 100644 build/import/libace/rules.make delete mode 100644 build/import/libace/stub.make delete mode 100644 build/import/libace/version (limited to 'build/import/libace') diff --git a/build/import/libace/configuration-rules.make b/build/import/libace/configuration-rules.make deleted file mode 100644 index 380e849..0000000 --- a/build/import/libace/configuration-rules.make +++ /dev/null @@ -1,13 +0,0 @@ -# file : build/import/libace/configuration-rules.make -# license : GNU GPL v2; see accompanying LICENSE file - -$(dcf_root)/import/libace/configuration-dynamic.make: | $(dcf_root)/import/libace/. - $(call message,,$(scf_root)/import/libace/configure $@) - -ifndef %foreign% - -disfigure:: - $(call message,rm $(dcf_root)/import/libace/configuration-dynamic.make,\ -rm -f $(dcf_root)/import/libace/configuration-dynamic.make) - -endif diff --git a/build/import/libace/configure b/build/import/libace/configure deleted file mode 100755 index 36aec69..0000000 --- a/build/import/libace/configure +++ /dev/null @@ -1,56 +0,0 @@ -#! /usr/bin/env bash - -# file : build/import/libace/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 'ACE' for '$project_name'." -$echo - -$echo -$echo "Would you like to configure dependency on the installed version" -$echo "of 'ACE' as opposed to the development build?" -$echo - -installed=`read_y_n y` - -path= -type= - -if [ "$installed" = "n" ]; then - - $echo - $echo "Please enter the 'ACE' root directory (ACE_ROOT)." - $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 libace_installed := $installed >$1 - -if [ "$installed" = "n" ]; then - - echo libace_root := $root >>$1 - echo libace_type := $type >>$1 - -fi diff --git a/build/import/libace/rules.make b/build/import/libace/rules.make deleted file mode 100644 index f183051..0000000 --- a/build/import/libace/rules.make +++ /dev/null @@ -1,27 +0,0 @@ -# file : build/import/libace/rules.make -# license : GNU GPL v2; see accompanying LICENSE file - -$(dcf_root)/import/libace/%: root := $(libace_root) - -ifeq ($(libace_type),archive) - -$(dcf_root)/import/libace/ace.l: $(libace_root)/lib/libACE.a - @echo $< >$@ -else - -$(dcf_root)/import/libace/ace.l: $(libace_root)/lib/libACE.so - @echo $< >$@ - @echo rpath:$(root)/lib >>$@ -endif - -$(dcf_root)/import/libace/ace.l.cpp-options: - @echo include: -I$(root) >$@ - -ifndef %foreign% - -disfigure:: - $(call message,rm $(dcf_root)/import/libace/ace.l,\ -rm -f $(dcf_root)/import/libace/ace.l) - $(call message,,rm -f $(dcf_root)/import/libace/ace.l.cpp-options) - -endif diff --git a/build/import/libace/stub.make b/build/import/libace/stub.make deleted file mode 100644 index fba22d5..0000000 --- a/build/import/libace/stub.make +++ /dev/null @@ -1,30 +0,0 @@ -# file : build/import/libace/stub.make -# license : GNU GPL v2; see accompanying LICENSE file - -$(call include-once,$(scf_root)/import/libace/configuration-rules.make,$(dcf_root)) - -libace_installed := - -$(call -include,$(dcf_root)/import/libace/configuration-dynamic.make) - -ifdef libace_installed - -ifeq ($(libace_installed),y) - -$(call export,l: -lACE,cpp-options: ) - -else - -$(call include-once,$(scf_root)/import/libace/rules.make,$(dcf_root)) - -$(call export,\ - l: $(dcf_root)/import/libace/ace.l,\ - cpp-options: $(dcf_root)/import/libace/ace.l.cpp-options) - -endif - -else - -.NOTPARALLEL: - -endif diff --git a/build/import/libace/version b/build/import/libace/version deleted file mode 100644 index 0d91a54..0000000 --- a/build/import/libace/version +++ /dev/null @@ -1 +0,0 @@ -0.3.0 -- cgit v1.1