Makefiles: Tweaks for Debian

[sdk] / crossplatform.mk

diff --git a/crossplatform.mk b/crossplatform.mk
index 26b0bec..6d1ee34 100644 (file)
--- a/crossplatform.mk
+++ b/crossplatform.mk
@@ -26,6 +26,17 @@ endif
 endif
 endif
 
+# DEBUG SUFFIX
+ifdef DEBUG
+DEBUG_SUFFIX := .debug
+endif
+
+ifdef COMPILER
+ifneq "$(COMPILER)" "default"
+COMPILER_SUFFIX := .$(COMPILER)
+endif
+endif
+
 # MISC STRING TOOLS
 empty :=
 space := $(empty) $(empty)
@@ -50,11 +61,11 @@ else
 endif
 
 # PREFIXES AND EXTENSIONS
-.SUFFIXES: .ec .pec .sym .imp .c .o .a
-P := .pec
+.SUFFIXES: .c .ec .sym .imp .bowl .o .a
 EC := .ec
 S := .sym
 I := .imp
+B := .bowl
 C := .c
 O := .o
 A := .a
@@ -126,9 +137,9 @@ ifdef WINDOWS
    FVISIBILITY :=
    FPIC :=
 ifeq "$(TARGET_TYPE)" "executable"
-   EXECUTABLE = $(CONSOLE)
+   EXECUTABLE := $(CONSOLE)
 else
-   EXECUTABLE =
+   EXECUTABLE :=
 endif
 else
    FVISIBILITY := -fvisibility=hidden
@@ -166,7 +177,7 @@ else
    SHAREDLIB :=
 endif
    LINKOPT :=
-   STRIPOPT := -x
+   STRIPOPT := -x --strip-unneeded --remove-section=.comment --remove-section=.note
 endif
 ifdef WINDOWS
    SODESTDIR := obj/$(PLATFORM)/bin/
@@ -174,6 +185,8 @@ else
    SODESTDIR := obj/$(PLATFORM)/lib/
 endif
 
+_L = $(if $(filter $(1),$(EXCLUDED_LIBS)),,-l$(1))
+
 # COMMON LIBRARIES DETECTION
 
 ifdef WINDOWS
@@ -183,6 +196,15 @@ _OPENSSL_CONF = $(call hidspace,$(call fixps,$(OPENSSL_CONF)))
 OPENSSL_INCLUDE_DIR = $(call shwspace,$(subst /bin/openssl.cfg,/include,$(_OPENSSL_CONF)))
 OPENSSL_LIB_DIR = $(call shwspace,$(subst /bin/openssl.cfg,/lib,$(_OPENSSL_CONF)))
 OPENSSL_BIN_DIR = $(call shwspace,$(subst /bin/openssl.cfg,/bin,$(_OPENSSL_CONF)))
+else
+# To avoid confusion with empty -L/-I
+OPENSSL_INCLUDE_DIR = .
+OPENSSL_LIB_DIR = .
+OPENSSL_BIN_DIR = .
 endif
 
+else
+
+OFLAGS += -L/usr/lib/ec
+
 endif