Fix tool build to work using make

diff --git a/sta_dk_4_0_4_32/CUDK/CLI/Makefile b/sta_dk_4_0_4_32/CUDK/CLI/Makefile
index c2bbee4..93bd1e5 100644 (file)
--- a/sta_dk_4_0_4_32/CUDK/CLI/Makefile
+++ b/sta_dk_4_0_4_32/CUDK/CLI/Makefile
@@ -30,9 +30,6 @@ IPC_SRC = $(CUDK_ROOT)/IPC/Linux
 
 OUTPUT_DIR ?= $(STA_DK_ROOT)/CUDK/CLI
 
-DK_INCS = -I $(CUDK_ROOT)/CLI/drv_inc \
-       -I $(CUDK_ROOT)/CLI/pform_inc
-
 ifeq ($(EXC),y)
         DK_INCS += \
        -I $(CUDK_ROOT)/CLI \
@@ -90,8 +87,12 @@ ifeq ($(BUILD_SUPPL), y)
   SUPPL_TARGET = $(OUTPUT_DIR)/wlan_suppl
 endif
 
-INCLUDES = $(DK_INCS) -I $(STA_DK_ROOT)/CUDK/CLI/pform_inc \
-                       -I $(STA_DK_ROOT)/CUDK/Inc
+INCLUDES = $(DK_INCS) -I $(STA_DK_ROOT)/pform/linux/inc -I $(STA_DK_ROOT)/CUDK/Inc \
+               -I $(STA_DK_ROOT)/pform/common/inc -I $(STA_DK_ROOT)/common/inc \
+               -I $(STA_DK_ROOT)/common/src/inc/ \
+               -I $(STA_DK_ROOT)/common/src/hal/FirmwareApi \
+               -I $(STA_DK_ROOT)/common/src/hal/TnetwServices \
+               -I $(STA_DK_ROOT)/common/src/hal/TnetwServices/TNETW1251
 
 ifeq ($(GWSI_SA), n)
 ifeq ($(BUILD_SUPPL), y)
@@ -135,7 +136,7 @@ endif
 
 $(TARGET): $(OBJS) $(TI_UTIL_ADAPTER_LIB)
 #      echo MAKECMDGOALS: $(MAKECMDGOALS) : $(findstring $(MAKECMDGOALS), "clean cleanall")
-       $(CROSS_COMPILE)gcc $(OBJS) -L $(CUDK_ROOT)/Output -l $(TI_UTIL_ADAPTER_LIB) $(LDFLAGS) -lpthread -lc -lstdc++ -o $@
+       $(CROSS_COMPILE)gcc $(OBJS) -L $(CUDK_ROOT)/Output -l $(TI_UTIL_ADAPTER_LIB) $(LDFLAGS) -lpthread -lc -lstdc++ -static -o $@
 ifeq ($(DEBUG), y)
        cp -a $(TARGET) $(TARGET)_debug
        $(CROSS_COMPILE)strip -s $(TARGET)

diff --git a/sta_dk_4_0_4_32/CUDK/CLI/ticon.c b/sta_dk_4_0_4_32/CUDK/CLI/ticon.c
index ef8658e..363b34f 100644 (file)
--- a/sta_dk_4_0_4_32/CUDK/CLI/ticon.c
+++ b/sta_dk_4_0_4_32/CUDK/CLI/ticon.c
@@ -35,6 +35,7 @@
 #include <stdarg.h>
 #include <sys/socket.h>
 #include <linux/in.h>
+#include <stddef.h>
 #include "ipc.h"
 #include "wipp_ctrl.h"
 #include "eth_utils.h"

diff --git a/sta_dk_4_0_4_32/CUDK/UtilityAdapter/Makefile b/sta_dk_4_0_4_32/CUDK/UtilityAdapter/Makefile
index a1acf8c..f441b53 100644 (file)
--- a/sta_dk_4_0_4_32/CUDK/UtilityAdapter/Makefile
+++ b/sta_dk_4_0_4_32/CUDK/UtilityAdapter/Makefile
@@ -33,11 +33,9 @@ CROSS_COMPILE ?= arm_v4t_le-
 
 SRCS = $(OAL_DIR)/Common/TI_OAL.cpp \
        $(OAL_DIR)/Pform/Linux/TILibLinux.cpp \
-       $(CUDK_ROOT)/UtilityAdapter/Linux/IpcWithTISMLinux.cpp \
        $(CUDK_ROOT)/UtilityAdapter/TI_AdapterApi.cpp \
        $(CUDK_ROOT)/UtilityAdapter/TI_Adapter.cpp \
        $(CUDK_ROOT)/UtilityAdapter/CTI_Adapter.cpp \
-       $(CUDK_ROOT)/UtilityAdapter/TI_IPC_Suppl.cpp \
        $(IPC_DIR)/Linux/ipc_event.c \
        $(IPC_DIR)/Linux/cu_ipc.c \
        $(IPC_DIR)/Linux/ipc_user.c
@@ -86,7 +84,8 @@ endif
        
        
 
-CFLAGS += -Wall -D__LINUX__ -D_IPC_SUPPL -DTI_EMBEDDED_SUPPLICANT
+CFLAGS += -Wall -D__LINUX__
+#-D_IPC_SUPPL -DTI_EMBEDDED_SUPPLICANT
 CFLAGS += $(DEBUGFLAGS)
 CFLAGS += $(INCLUDEDIR) $(ARMFLAGS)
 
@@ -96,11 +95,14 @@ DEPS = $(OBJS:%.o=%.d)
 
 all: $(TARGET)
 
-$(OUTPUT_DIR)/libtiOsLib.a: $(OBJS)
+$(OUTPUT_DIR):
+       mkdir $@
+
+$(OUTPUT_DIR)/libtiOsLib.a: $(OBJS) $(OUTPUT_DIR)
        rm -f $@
-       $(CROSS_COMPILE)$(AR) -q $@ $^
+       $(CROSS_COMPILE)$(AR) -q $@ $(OBJS)
 
-$(OUTPUT_DIR)/libtiOsLib.so: $(OBJS)
+$(OUTPUT_DIR)/libtiOsLib.so: $(OBJS) $(OUTPUT_DIR)
        rm -f $@
        $(CROSS_COMPILE)gcc -shared $(CFLAGS) $(OBJS) -lc -o $@
        $(CROSS_COMPILE)strip $@

diff --git a/sta_dk_4_0_4_32/CUDK/tiwlan_loader/Makefile b/sta_dk_4_0_4_32/CUDK/tiwlan_loader/Makefile
new file mode 100644 (file)
index 0000000..6463a04
--- /dev/null
+++ b/sta_dk_4_0_4_32/CUDK/tiwlan_loader/Makefile
@@ -0,0 +1,19 @@
+my-dir = .
+
+include Android.mk
+
+CC = $(CROSS_COMPILE)gcc
+CXX = $(CROSS_COMPILE)g++
+CFLAGS = $(LOCAL_CFLAGS) $(addprefix -I,$(LOCAL_C_INCLUDES))
+OBJS = $(patsubst %.c,%.o,$(LOCAL_SRC_FILES))
+
+TIOSLIB := ../Output/libtiOsLib.a
+
+$(TARGET) : $(OBJS) $(TIOSLIB)
+       $(CXX) -static -o $@ $^ -lpthread
+
+$(TIOSLIB):
+       @make -C ../UtilityAdapter/
+
+clean:
+       $(RM) $(TARGET) $(OBJS)