Ecere Software / sdk / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8484dfe)
sdk/Build System: Took out erroneous/superfluous stuff from include.mk; Added missing...
authorJerome St-Louis <jerome@ecere.com>
Mon, 5 Nov 2012 20:37:12 +0000 (15:37 -0500)
committerJerome St-Louis <jerome@ecere.com>
Mon, 5 Nov 2012 20:37:12 +0000 (15:37 -0500)
16 files changed:
compiler/ecc/Makefile patch | blob | history
compiler/ecp/Makefile patch | blob | history
compiler/ecs/Makefile patch | blob | history
compiler/libec/Makefile patch | blob | history
documentor/Makefile patch | blob | history
ear/cmd/Makefile patch | blob | history
ear/extract/Makefile patch | blob | history
ecere/Makefile patch | blob | history
ecere/Makefile.ecereCOM patch | blob | history
ecere/Makefile.vanilla patch | blob | history
eda/drivers/sqlite/Makefile patch | blob | history
eda/drivers/sqliteCipher/Makefile patch | blob | history
eda/libeda/Makefile patch | blob | history
epj2make/Makefile patch | blob | history
ide/Makefile patch | blob | history
include.mk patch | blob | history

diff --git a/compiler/ecc/Makefile b/compiler/ecc/Makefile
index 46d3ae6..9381e1a 100755 (executable)
--- a/compiler/ecc/Makefile
+++ b/compiler/ecc/Makefile
@@ -39,8 +39,8 @@ include $(_CF_DIR)include.mk
 export LD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/
 export DYLD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/
 ECP := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecp)
-ECC := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecc)
-ECS := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecs)
+ECC := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecc)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
+ECS := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecs)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
 EAR := $(call psep,../../obj/$(PLATFORM)/bin/ear)
 
 # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG
diff --git a/compiler/ecp/Makefile b/compiler/ecp/Makefile
index 520c272..5169884 100755 (executable)
--- a/compiler/ecp/Makefile
+++ b/compiler/ecp/Makefile
@@ -39,8 +39,8 @@ include $(_CF_DIR)include.mk
 export LD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/
 export DYLD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/
 ECP := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecp)
-ECC := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecc)
-ECS := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecs)
+ECC := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecc)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
+ECS := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecs)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
 EAR := $(call psep,../../obj/$(PLATFORM)/bin/ear)
 
 # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG
diff --git a/compiler/ecs/Makefile b/compiler/ecs/Makefile
index cef40ea..278ecfa 100755 (executable)
--- a/compiler/ecs/Makefile
+++ b/compiler/ecs/Makefile
@@ -39,8 +39,8 @@ include $(_CF_DIR)include.mk
 export LD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/
 export DYLD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/
 ECP := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecp)
-ECC := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecc)
-ECS := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecs)
+ECC := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecc)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
+ECS := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecs)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
 EAR := $(call psep,../../obj/$(PLATFORM)/bin/ear)
 
 # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG
diff --git a/compiler/libec/Makefile b/compiler/libec/Makefile
index b1b4c26..0bdd0c2 100755 (executable)
--- a/compiler/libec/Makefile
+++ b/compiler/libec/Makefile
@@ -42,8 +42,8 @@ export LD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/
 export DYLD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/
 endif
 ECP := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecp)
-ECC := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecc)
-ECS := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecs)
+ECC := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecc)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
+ECS := $(call psep,../bootstrap/obj/bin.$(PLATFORM)/ecs)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
 EAR := $(call psep,../../obj/$(PLATFORM)/bin/ear)
 
 # BSL CFLAGS
diff --git a/documentor/Makefile b/documentor/Makefile
index 38f84d1..0676237 100755 (executable)
--- a/documentor/Makefile
+++ b/documentor/Makefile
@@ -39,8 +39,8 @@ include $(_CF_DIR)include.mk
 export LD_LIBRARY_PATH=../obj/$(PLATFORM)/lib
 export DYLD_LIBRARY_PATH=../obj/$(PLATFORM)/lib
 ECP := $(call psep,../obj/$(PLATFORM)/bin/ecp)
-ECC := $(call psep,../obj/$(PLATFORM)/bin/ecc)
-ECS := $(call psep,../obj/$(PLATFORM)/bin/ecs)
+ECC := $(call psep,../obj/$(PLATFORM)/bin/ecc)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
+ECS := $(call psep,../obj/$(PLATFORM)/bin/ecs)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
 EAR := $(call psep,../obj/$(PLATFORM)/bin/ear)
 
 # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG
diff --git a/ear/cmd/Makefile b/ear/cmd/Makefile
index e8c9085..20fcdf7 100755 (executable)
--- a/ear/cmd/Makefile
+++ b/ear/cmd/Makefile
@@ -39,8 +39,8 @@ include $(_CF_DIR)include.mk
 export LD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/
 export DYLD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/
 ECP := $(call psep,../../compiler/bootstrap/obj/bin.$(PLATFORM)/ecp)
-ECC := $(call psep,../../compiler/bootstrap/obj/bin.$(PLATFORM)/ecc)
-ECS := $(call psep,../../compiler/bootstrap/obj/bin.$(PLATFORM)/ecs)
+ECC := $(call psep,../../compiler/bootstrap/obj/bin.$(PLATFORM)/ecc)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
+ECS := $(call psep,../../compiler/bootstrap/obj/bin.$(PLATFORM)/ecs)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
 EAR := $(call psep,../../obj/$(PLATFORM)/bin/ear)
 
 # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG
diff --git a/ear/extract/Makefile b/ear/extract/Makefile
index 7721884..76e430f 100755 (executable)
--- a/ear/extract/Makefile
+++ b/ear/extract/Makefile
@@ -39,8 +39,8 @@ include $(_CF_DIR)include.mk
 export LD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/
 export DYLD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/
 ECP := $(call psep,../../compiler/bootstrap/obj/bin.$(PLATFORM)/ecp)
-ECC := $(call psep,../../compiler/bootstrap/obj/bin.$(PLATFORM)/ecc)
-ECS := $(call psep,../../compiler/bootstrap/obj/bin.$(PLATFORM)/ecs)
+ECC := $(call psep,../../compiler/bootstrap/obj/bin.$(PLATFORM)/ecc)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
+ECS := $(call psep,../../compiler/bootstrap/obj/bin.$(PLATFORM)/ecs)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
 EAR := $(call psep,../../obj/$(PLATFORM)/bin/ear)
 
 # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG
diff --git a/ecere/Makefile b/ecere/Makefile
index 3e6a6fc..c62edec 100755 (executable)
--- a/ecere/Makefile
+++ b/ecere/Makefile
@@ -39,8 +39,8 @@ include $(_CF_DIR)include.mk
 export LD_LIBRARY_PATH=../obj/$(PLATFORM)/lib
 export DYLD_LIBRARY_PATH=../obj/$(PLATFORM)/lib
 ECP := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecp$(E))
-ECC := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecc$(E))
-ECS := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecs$(E))
+ECC := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecc$(E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
+ECS := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecs$(E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
 EAR := $(call psep,../obj/$(PLATFORM)/bin/ear)
 
 # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG
diff --git a/ecere/Makefile.ecereCOM b/ecere/Makefile.ecereCOM
index 74c612b..28fbe44 100755 (executable)
--- a/ecere/Makefile.ecereCOM
+++ b/ecere/Makefile.ecereCOM
@@ -37,8 +37,8 @@ include $(_CF_DIR)include.mk
 # CUSTOM TOOLCHAIN / COMPILER CONFIG
 
 ECP := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecp$(E))
-ECC := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecc$(E))
-ECS := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecs$(E))
+ECC := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecc$(E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
+ECS := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecs$(E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
 EAR := $(call psep,../obj/$(PLATFORM)/bin/ear)
 
 # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG
diff --git a/ecere/Makefile.vanilla b/ecere/Makefile.vanilla
index d8b3fa8..5d923f0 100755 (executable)
--- a/ecere/Makefile.vanilla
+++ b/ecere/Makefile.vanilla
@@ -37,8 +37,8 @@ include $(_CF_DIR)include.mk
 # CUSTOM TOOLCHAIN / COMPILER CONFIG
 
 ECP := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecp$(E))
-ECC := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecc$(E))
-ECS := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecs$(E))
+ECC := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecc$(E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
+ECS := $(call psep,../compiler/bootstrap/obj/bin.$(PLATFORM)/ecs$(E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
 EAR := $(call psep,../obj/$(PLATFORM)/bin/ear)
 
 # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG
diff --git a/eda/drivers/sqlite/Makefile b/eda/drivers/sqlite/Makefile
index 152f23b..2cf43fe 100755 (executable)
--- a/eda/drivers/sqlite/Makefile
+++ b/eda/drivers/sqlite/Makefile
@@ -39,8 +39,8 @@ include $(_CF_DIR)include.mk
 export LD_LIBRARY_PATH = ../../../obj/$(PLATFORM)/lib/
 export DYLD_LIBRARY_PATH = ../../../obj/$(PLATFORM)/lib/
 ECP := $(call psep,../../../obj/$(PLATFORM)/bin/ecp)
-ECC := $(call psep,../../../obj/$(PLATFORM)/bin/ecc)
-ECS := $(call psep,../../../obj/$(PLATFORM)/bin/ecs)
+ECC := $(call psep,../../../obj/$(PLATFORM)/bin/ecc)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
+ECS := $(call psep,../../../obj/$(PLATFORM)/bin/ecs)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
 EAR := $(call psep,../../../obj/$(PLATFORM)/bin/ear)
 
 # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG
diff --git a/eda/drivers/sqliteCipher/Makefile b/eda/drivers/sqliteCipher/Makefile
index 8b86aa9..00eb39d 100755 (executable)
--- a/eda/drivers/sqliteCipher/Makefile
+++ b/eda/drivers/sqliteCipher/Makefile
@@ -39,8 +39,8 @@ include $(_CF_DIR)include.mk
 export LD_LIBRARY_PATH = ../../../obj/$(PLATFORM)/lib/
 export DYLD_LIBRARY_PATH = ../../../obj/$(PLATFORM)/lib/
 ECP := $(call psep,../../../obj/$(PLATFORM)/bin/ecp)
-ECC := $(call psep,../../../obj/$(PLATFORM)/bin/ecc)
-ECS := $(call psep,../../../obj/$(PLATFORM)/bin/ecs)
+ECC := $(call psep,../../../obj/$(PLATFORM)/bin/ecc)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
+ECS := $(call psep,../../../obj/$(PLATFORM)/bin/ecs)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
 EAR := $(call psep,../../../obj/$(PLATFORM)/bin/ear)
 
 # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG
diff --git a/eda/libeda/Makefile b/eda/libeda/Makefile
index 56ebe3c..7e9908f 100755 (executable)
--- a/eda/libeda/Makefile
+++ b/eda/libeda/Makefile
@@ -39,8 +39,8 @@ include $(_CF_DIR)include.mk
 export LD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/
 export DYLD_LIBRARY_PATH = ../../obj/$(PLATFORM)/lib/
 ECP := $(call psep,../../obj/$(PLATFORM)/bin/ecp)
-ECC := $(call psep,../../obj/$(PLATFORM)/bin/ecc)
-ECS := $(call psep,../../obj/$(PLATFORM)/bin/ecs)
+ECC := $(call psep,../../obj/$(PLATFORM)/bin/ecc)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
+ECS := $(call psep,../../obj/$(PLATFORM)/bin/ecs)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
 EAR := $(call psep,../../obj/$(PLATFORM)/bin/ear)
 
 # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG
diff --git a/epj2make/Makefile b/epj2make/Makefile
index ba8399d..1a1467c 100755 (executable)
--- a/epj2make/Makefile
+++ b/epj2make/Makefile
@@ -39,8 +39,8 @@ include $(_CF_DIR)include.mk
 export LD_LIBRARY_PATH=../obj/$(PLATFORM)/lib
 export DYLD_LIBRARY_PATH=../obj/$(PLATFORM)/lib
 ECP := $(call psep,../obj/$(PLATFORM)/bin/ecp)
-ECC := $(call psep,../obj/$(PLATFORM)/bin/ecc)
-ECS := $(call psep,../obj/$(PLATFORM)/bin/ecs)
+ECC := $(call psep,../obj/$(PLATFORM)/bin/ecc)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
+ECS := $(call psep,../obj/$(PLATFORM)/bin/ecs)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
 EAR := $(call psep,../obj/$(PLATFORM)/bin/ear)
 
 # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG
diff --git a/ide/Makefile b/ide/Makefile
index 14bf649..28bead7 100755 (executable)
--- a/ide/Makefile
+++ b/ide/Makefile
@@ -39,8 +39,8 @@ include $(_CF_DIR)include.mk
 export LD_LIBRARY_PATH=../obj/$(PLATFORM)/lib
 export DYLD_LIBRARY_PATH=../obj/$(PLATFORM)/lib
 ECP := $(call psep,../obj/$(PLATFORM)/bin/ecp)
-ECC := $(call psep,../obj/$(PLATFORM)/bin/ecc)
-ECS := $(call psep,../obj/$(PLATFORM)/bin/ecs)
+ECC := $(call psep,../obj/$(PLATFORM)/bin/ecc)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
+ECS := $(call psep,../obj/$(PLATFORM)/bin/ecs)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
 EAR := $(call psep,../obj/$(PLATFORM)/bin/ear)
 
 # END OF CUSTOM TOOLCHAIN / COMPILER CONFIG
diff --git a/include.mk b/include.mk
index 2744141..68af6ef 100644 (file)
--- a/include.mk
+++ b/include.mk
@@ -1,21 +1,12 @@
 # TOOLCHAIN
 export CC      = $(CCACHE_COMPILE)$(DISTCC_COMPILE)$(GCC_PREFIX)gcc$(_SYSROOT)
 export CPP     = $(CCACHE_COMPILE)$(DISTCC_COMPILE)$(GCC_PREFIX)cpp$(_SYSROOT)
-export ECP     = ecp
-export ECC     = ecc
-export ECS     = %s$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
-export EAR     = ear
 export AS      = $(GCC_PREFIX)as
 export LD      = $(GCC_PREFIX)ld
 export AR      = $(GCC_PREFIX)ar
 export STRIP   = $(GCC_PREFIX)strip
 UPX := upx
 
-# DEBIAN
-ifdef DEBIAN_PACKAGE
-CFLAGS += $(CPPFLAGS)
-endif
-
 ifeq "$(HOST_ARCH)" "ARM"
 FORCE_64_BIT =
 FORCE_32_BIT =
The Ecere SDK