summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in10
-rwxr-xr-xconfigure22
-rw-r--r--sofort/config/cfgdefs.in (renamed from sofort/cfgdefs.in)0
-rw-r--r--sofort/config/config.vars (renamed from sofort/config.vars)0
-rw-r--r--sofort/config/flag.vars (renamed from sofort/flag.vars)0
-rw-r--r--sofort/core/defs.mk (renamed from sofort/defs.mk)0
-rw-r--r--sofort/core/flavor.mk (renamed from sofort/flavor.mk)0
-rw-r--r--sofort/core/pkgconf.mk (renamed from sofort/pkgconf.mk)2
-rw-r--r--sofort/core/version.mk (renamed from sofort/version.mk)0
-rwxr-xr-xsofort/tools/pkgconf.sh (renamed from sofort/pkgconf.sh)0
-rwxr-xr-xsofort/tools/version.sh (renamed from sofort/version.sh)0
11 files changed, 20 insertions, 14 deletions
diff --git a/Makefile.in b/Makefile.in
index 5b8006a..77882ae 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -115,10 +115,10 @@ include ./ccenv/native.mk
include ./cfgdefs.mk
include ./usrdefs.mk
-include $(PROJECT_DIR)/sofort/defs.mk
-include $(PROJECT_DIR)/sofort/pkgconf.mk
-include $(PROJECT_DIR)/sofort/version.mk
-include $(PROJECT_DIR)/sofort/flavor.mk
+include $(PROJECT_DIR)/sofort/core/defs.mk
+include $(PROJECT_DIR)/sofort/core/pkgconf.mk
+include $(PROJECT_DIR)/sofort/core/version.mk
+include $(PROJECT_DIR)/sofort/core/flavor.mk
include $(PROJECT_DIR)/project/osforce.mk
include $(PROJECT_DIR)/project/tree.mk
@@ -252,7 +252,7 @@ host.tag: Makefile
mv host.tmp host.tag
version.tag: $(GIT_REFERENCE_INDEX) dirs.tag
- $(PROJECT_DIR)/sofort/version.sh \
+ $(PROJECT_DIR)/sofort/tools/version.sh \
-s $(SOURCE_DIR) \
-o build/$(PACKAGE)_version.h \
-p $(PACKAGE)
diff --git a/configure b/configure
index d28e1be..95e1ba9 100755
--- a/configure
+++ b/configure
@@ -50,16 +50,23 @@ init_vars()
mb_custom_cfgdefs_args=''
mb_custom_cfgdefs_space=''
- mb_make_vars=$(cat $mb_project_dir/sofort/config.vars \
+ sfrt_impl_dir=$mb_project_dir/sofort
+ sfrt_config_dir=$sfrt_impl_dir/config
+ sfrt_core_dir=$sfrt_impl_dir/core
+ sfrt_config_vars=$sfrt_config_dir/config.vars
+ sfrt_flag_vars=$sfrt_config_dir/flag.vars
+ sfrt_cfgdefs_in=$sfrt_config_dir/cfgdefs.in
+
+ mb_make_vars=$(cat $sfrt_config_vars \
| grep -v -e '^#' -e '^$' | tr '[:lower:]' '[:upper:]')
- mb_impl_vars=$(cat $mb_project_dir/sofort/config.vars \
+ mb_impl_vars=$(cat $sfrt_config_vars \
| grep -v -e '^#' -e '^$' | sed 's/^/mb_/g')
- mb_proj_vars=$(cat $mb_project_dir/sofort/config.vars \
+ mb_proj_vars=$(cat $sfrt_config_vars \
| grep -v -e '^#' -e '^$' | sed 's/^/mb_default_/g')
- mb_flag_vars=$(cat $mb_project_dir/sofort/flag.vars \
+ mb_flag_vars=$(cat $sfrt_flag_vars \
| grep -v -e '^#' -e '^$')
mb_vars="$mb_make_vars $mb_impl_vars $mb_proj_vars $mb_flag_vars"
@@ -89,14 +96,13 @@ init_vars()
# project-specific config definitions
if [ _$mb_use_custom_cfgdefs = _yes ]; then
- cat $mb_project_dir/sofort/cfgdefs.in \
- > cfgdefs.mk
+ cat $sfrt_cfgdefs_in > cfgdefs.mk
else
printf '%s %s\n\n' \
'# this project does not include' \
'a custom config step.' \
> cfgdefs.mk
- cat $mb_project_dir/sofort/cfgdefs.in >> cfgdefs.mk
+ cat $sfrt_cfgdefs_in >> cfgdefs.mk
if [ -f $mb_project_dir/project/cfgdefs.in ]; then
cat $mb_project_dir/project/cfgdefs.in >> cfgdefs.mk
@@ -397,7 +403,7 @@ config_flags()
config_copy()
{
- mb_vars=$(cut -d'=' -f1 "$mb_project_dir/sofort/config.vars" \
+ mb_vars=$(cut -d'=' -f1 $sfrt_config_vars \
| grep -v '^#')
mb_sed_substs=" \
diff --git a/sofort/cfgdefs.in b/sofort/config/cfgdefs.in
index fd4b947..fd4b947 100644
--- a/sofort/cfgdefs.in
+++ b/sofort/config/cfgdefs.in
diff --git a/sofort/config.vars b/sofort/config/config.vars
index ac7c2aa..ac7c2aa 100644
--- a/sofort/config.vars
+++ b/sofort/config/config.vars
diff --git a/sofort/flag.vars b/sofort/config/flag.vars
index 4229e3e..4229e3e 100644
--- a/sofort/flag.vars
+++ b/sofort/config/flag.vars
diff --git a/sofort/defs.mk b/sofort/core/defs.mk
index 151bc3d..151bc3d 100644
--- a/sofort/defs.mk
+++ b/sofort/core/defs.mk
diff --git a/sofort/flavor.mk b/sofort/core/flavor.mk
index bd9ab06..bd9ab06 100644
--- a/sofort/flavor.mk
+++ b/sofort/core/flavor.mk
diff --git a/sofort/pkgconf.mk b/sofort/core/pkgconf.mk
index c8fc711..f266b9f 100644
--- a/sofort/pkgconf.mk
+++ b/sofort/core/pkgconf.mk
@@ -25,7 +25,7 @@ build/$(PACKAGE).pc:
PKGCONF_LIBDIR='$(LIBDIR)' \
PKGCONF_INCLUDEDIR='$(INCLUDEDIR)' \
PKGCONF_VERSION='$(PKGCONF_VERSION)' \
- $(PROJECT_DIR)/sofort/pkgconf.sh > $@
+ $(PROJECT_DIR)/sofort/tools/pkgconf.sh > $@
install-pkgconf: build/$(PACKAGE).pc
mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
diff --git a/sofort/version.mk b/sofort/core/version.mk
index 5ef0ee2..5ef0ee2 100644
--- a/sofort/version.mk
+++ b/sofort/core/version.mk
diff --git a/sofort/pkgconf.sh b/sofort/tools/pkgconf.sh
index a37e368..a37e368 100755
--- a/sofort/pkgconf.sh
+++ b/sofort/tools/pkgconf.sh
diff --git a/sofort/version.sh b/sofort/tools/version.sh
index f510a32..f510a32 100755
--- a/sofort/version.sh
+++ b/sofort/tools/version.sh