From 8e761289a2446367267c6c0d9a26e734f0f78306 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 16 Dec 2020 20:29:05 +0300 Subject: Get rid of legacy build systems and rename cutl/ to libcutl/ --- build/bootstrap.make | 72 --------------------------- build/export.build | 4 +- build/export/libcutl/stub.make | 8 --- build/import/libcutl/configuration-rules.make | 13 ----- build/import/libcutl/configure | 53 -------------------- build/import/libcutl/stub.make | 28 ----------- 6 files changed, 2 insertions(+), 176 deletions(-) delete mode 100644 build/bootstrap.make delete mode 100644 build/export/libcutl/stub.make delete mode 100644 build/import/libcutl/configuration-rules.make delete mode 100755 build/import/libcutl/configure delete mode 100644 build/import/libcutl/stub.make (limited to 'build') diff --git a/build/bootstrap.make b/build/bootstrap.make deleted file mode 100644 index f6f9d59..0000000 --- a/build/bootstrap.make +++ /dev/null @@ -1,72 +0,0 @@ -# file : build/bootstrap.make -# license : MIT; see accompanying LICENSE file - -project_name := libcutl - -# First try to include the bundled bootstrap.make if it exist. If that -# fails, let make search for the external bootstrap.make. -# -build := build-0.3 - --include $(dir $(lastword $(MAKEFILE_LIST)))../../$(build)/bootstrap.make - -ifeq ($(patsubst %build/bootstrap.make,,$(lastword $(MAKEFILE_LIST))),) -include $(build)/bootstrap.make -endif - - -# Aliases -# -.PHONY: $(out_base)/ \ - $(out_base)/.test \ - $(out_base)/.dist \ - $(out_base)/.install \ - $(out_base)/.clean - -ifdef %interactive% - -.PHONY: test dist install clean - -test: $(out_base)/.test -dist: $(out_base)/.dist -install: $(out_base)/.install -clean: $(out_base)/.clean - -ifneq ($(filter $(.DEFAULT_GOAL),test dist install clean),) -.DEFAULT_GOAL := -endif - -endif - -# Make sure the distribution prefix is set if the goal is dist. -# -ifneq ($(filter $(MAKECMDGOALS),dist),) -ifeq ($(dist_prefix),) -$(error dist_prefix is not set) -endif -endif - -# If we don't have dependency auto-generation then we need to manually -# make sure that generated files are generated before C++ file are -# compiler. To do this we make the object files ($2) depend in order- -# only on generated files ($3). -# -ifeq ($(cxx_id),generic) - -define include-dep -$(if $2,$(eval $2: | $3)) -endef - -else - -define include-dep -$(call -include,$1) -endef - -endif - -# Don't include dependency info for certain targets. -# -ifneq ($(filter $(MAKECMDGOALS),clean disfigure dist),) -include-dep = -endif diff --git a/build/export.build b/build/export.build index 12d96d4..71441fd 100644 --- a/build/export.build +++ b/build/export.build @@ -3,7 +3,7 @@ $out_root/ { - include cutl/ + include libcutl/ } -export $out_root/cutl/lib{cutl} +export $out_root/libcutl/lib{cutl} diff --git a/build/export/libcutl/stub.make b/build/export/libcutl/stub.make deleted file mode 100644 index 8b6c105..0000000 --- a/build/export/libcutl/stub.make +++ /dev/null @@ -1,8 +0,0 @@ -# file : build/export/libcutl/stub.make -# license : MIT; see accompanying LICENSE file - -$(call include-once,$(src_root)/cutl/makefile,$(out_root)) - -$(call export,\ - l: $(out_root)/cutl/cutl.l,\ - cpp-options: $(out_root)/cutl/cutl.l.cpp-options) diff --git a/build/import/libcutl/configuration-rules.make b/build/import/libcutl/configuration-rules.make deleted file mode 100644 index 4559510..0000000 --- a/build/import/libcutl/configuration-rules.make +++ /dev/null @@ -1,13 +0,0 @@ -# file : build/import/libcutl/configuration-rules.make -# license : MIT; see accompanying LICENSE file - -$(dcf_root)/import/libcutl/configuration-dynamic.make: | $(dcf_root)/import/libcutl/. - $(call message,,$(scf_root)/import/libcutl/configure $@) - -ifndef %foreign% - -$(dcf_root)/.disfigure:: - $(call message,rm $(dcf_root)/import/libcutl/configuration-dynamic.make,\ -rm -f $(dcf_root)/import/libcutl/configuration-dynamic.make) - -endif diff --git a/build/import/libcutl/configure b/build/import/libcutl/configure deleted file mode 100755 index 5c182e2..0000000 --- a/build/import/libcutl/configure +++ /dev/null @@ -1,53 +0,0 @@ -#! /usr/bin/env bash - -# file : build/import/libcutl/configure -# license : MIT; see accompanying LICENSE file - - -# $1 - out file -# -# bld_root - build root -# project_name - project name -# - -source $bld_root/dialog.bash - - -$echo -$echo "Configuring external dependency on 'libcutl' for '$project_name'." -$echo - -$echo -$echo "Would you like to configure dependency on the installed " -$echo "version of 'libcutl' as opposed to the development build?" -$echo - -installed=`read_y_n y` - -path= - -if [ "$installed" = "n" ]; then - -$echo -$echo "Please enter the src_root for 'libcutl'." -$echo - -src_root=`read_path --directory --exist` - -$echo -$echo "Please enter the out_root for 'libcutl'." -$echo - -out_root=`read_path --directory $src_root` - -fi - -echo libcutl_installed := $installed >$1 - -if [ "$installed" = "n" ]; then - -echo src_root := $src_root >>$1 -echo scf_root := \$\(src_root\)/build >>$1 -echo out_root := $out_root >>$1 - -fi diff --git a/build/import/libcutl/stub.make b/build/import/libcutl/stub.make deleted file mode 100644 index 11876f2..0000000 --- a/build/import/libcutl/stub.make +++ /dev/null @@ -1,28 +0,0 @@ -# file : build/import/libcutl/stub.make -# license : MIT; see accompanying LICENSE file - -$(call include-once,$(scf_root)/import/libcutl/configuration-rules.make,$(dcf_root)) - -libcutl_installed := - -$(call -include,$(dcf_root)/import/libcutl/configuration-dynamic.make) - -ifdef libcutl_installed - -ifeq ($(libcutl_installed),y) - -$(call export,l: -lcutl,cpp-options: ) - -else - -# Include export stub. -# -$(call include,$(scf_root)/export/libcutl/stub.make) - -endif - -else - -.NOTPARALLEL: - -endif -- cgit v1.1