tarball,Makefiles; uniform use of _CF_DIR when importing crossplatform.mk and default...

diff --git a/Makefile b/Makefile
index 10efdd2..3d6addd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -882,6 +882,7 @@ update_ecs:
 
 troubleshoot:
        @$(call echo,Printing values of some variables.)
+       @$(call echo,_CF_DIR=$(_CF_DIR))
        @$(call echo,HOST_PLATFORM=$(HOST_PLATFORM))
        @$(call echo,TARGET_PLATFORM=$(TARGET_PLATFORM))
        @$(call echo,PLATFORM=$(PLATFORM))

diff --git a/compiler/Makefile b/compiler/Makefile
index a87f751..b6bdeac 100644 (file)
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -5,8 +5,10 @@ endif
 
 CONFIG := release
 
-include ../crossplatform.mk
-include ../default.cf
+_CF_DIR = ../
+
+include $(_CF_DIR)crossplatform.mk
+include $(_CF_DIR)default.cf
 
 all: ecp ecc ecs
 

diff --git a/compiler/bootstrap/Makefile b/compiler/bootstrap/Makefile
index 3b035ec..92daa1b 100644 (file)
--- a/compiler/bootstrap/Makefile
+++ b/compiler/bootstrap/Makefile
@@ -5,8 +5,10 @@ endif
 
 OBJ = obj/bin.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/
 
-include ../../crossplatform.mk
-include ../../default.cf
+_CF_DIR = ../../
+
+include $(_CF_DIR)crossplatform.mk
+include $(_CF_DIR)default.cf
 
 all: bindir ecere libec ecp ecc ecs
        $(call cpq,ecp/obj/bootstrap.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/ecp$(E) ecc/obj/bootstrap.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/ecc$(E) ecs/obj/bootstrap.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/ecs$(E),$(OBJ))

diff --git a/deps/Makefile b/deps/Makefile
index accd4ef..6dcec59 100644 (file)
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -1,10 +1,10 @@
 .PHONY: freetype jpeg png gif z ffi cleantarget clean realclean distclean
 .SILENT:
 
-# CROSS-PLATFORM MAGIC
+_CF_DIR = ../
 
-include ../crossplatform.mk
-include ../default.cf
+include $(_CF_DIR)crossplatform.mk
+include $(_CF_DIR)default.cf
 
 ifdef WINDOWS_TARGET
 all: freetype jpeg png gif ffi z

diff --git a/ear/Makefile b/ear/Makefile
index 44cc60e..14f8d0c 100644 (file)
--- a/ear/Makefile
+++ b/ear/Makefile
@@ -3,10 +3,10 @@ ifneq ($(V),1)
 endif
 .PHONY: all nores cleantarget clean realclean distclean
 
-# CROSS-PLATFORM MAGIC
+_CF_DIR = ../
 
-include ../crossplatform.mk
-include ../default.cf
+include $(_CF_DIR)crossplatform.mk
+include $(_CF_DIR)default.cf
 
 all:
        @$(call echo,Building self-extract tool...)

diff --git a/eda/Makefile b/eda/Makefile
index be9ebbb..1f4a42a 100644 (file)
--- a/eda/Makefile
+++ b/eda/Makefile
@@ -3,8 +3,6 @@ ifneq ($(V),1)
 endif
 .PHONY: all cmd cleantarget clean realclean distclean
 
-# CROSS-PLATFORM MAGIC
-
 _CF_DIR = ../
 
 include $(_CF_DIR)crossplatform.mk