sdk/Build System: Took out extra inclusion of LDFLAGS; Moved $(CPPFLAGS) and -D_DEBUG...

[sdk] / eda / libeda / Makefile

diff --git a/eda/libeda/Makefile b/eda/libeda/Makefile
index 56ebe3c..9ae621a 100755 (executable)
--- a/eda/libeda/Makefile
+++ b/eda/libeda/Makefile
@@ -15,10 +15,10 @@ TARGET_TYPE = sharedlib
 ECFLAGS =
 ifndef DEBIAN_PACKAGE
 CFLAGS =
+LDFLAGS =
 endif
 CECFLAGS =
 OFLAGS =
-LDFLAGS =
 LIBS =
 
 ifdef DEBUG
@@ -32,18 +32,7 @@ CONSOLE = -mwindows
 _CF_DIR = ../../
 
 include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)include.mk
-
-# CUSTOM TOOLCHAIN / COMPILER CONFIG
-
-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)
-EAR := $(call psep,../../obj/$(PLATFORM)/bin/ear)
-
-# END OF CUSTOM TOOLCHAIN / COMPILER CONFIG
+include $(_CF_DIR)default.cf
 
 # POST-INCLUDES VARIABLES
 
@@ -113,6 +102,13 @@ ifdef WINDOWS_TARGET
 
 endif
 
+ifdef LINUX_TARGET
+# To fix libffi build problem on Oneiric/amd64
+CFLAGS += \
+        -I/usr/include/i686-linux-gnu
+
+endif
+
 
 
 CECFLAGS += -cpp $(_CPP)
@@ -121,7 +117,6 @@ ifndef STATIC_LIBRARY_TARGET
 OFLAGS += $(FORCE_32_BIT) \
         -L../../obj/$(PLATFORM)/bin \
         -L../../obj/$(PLATFORM)/lib
-OFLAGS += $(LDFLAGS)
 endif
 
 # TARGETS