[FIX] evas_gl pack arguments and return values

[platform/core/system/swap-probe.git] / Makefile

diff --git a/Makefile b/Makefile
index c4e7a0b..f6dae95 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,7 @@ INCLUDE_CPPFLAGS =                            \
                -I/usr/include/evas-1           \
                -I/usr/include/pixman-1         \
                -I/usr/include/system           \
+               -I/usr/include/capi-system-runtime-info \
                -I/usr/include/vconf            \
                -I/usr/lib/dbus-1.0/include     \
 
@@ -70,6 +71,7 @@ UTILITY_SRCS =                                \
        ./helper/dacollection.c         \
        ./helper/dacapture.c            \
        ./helper/daforkexec.c           \
+       ./helper/damaps.c                       \
        ./custom_chart/da_chart.c       \
 
 PROBE_SRCS =                                   \
@@ -88,13 +90,17 @@ PROBE_SRCS =                                        \
 
 DUMMY_SRCS = ./custom_chart/da_chart_dummy.c
 CAPI_SRCS =    $(COMMON_SRCS)                  \
-               ./probe_capi/capi_appfw.c       \
-               ./probe_ui/capi_capture.c
-
-TIZEN_SRCS =   $(COMMON_SRCS)                          \
-               ./helper/addr-tizen.c                   \
-               ./helper/common_probe_init.cpp  \
-               ./probe_memory/libdanew.cpp
+               ./probe_capi/capi_appfw.c
+#              ./probe_ui/capi_capture.c
+
+TIZEN_SRCS =   $(COMMON_SRCS) $(CAPI_SRCS)\
+               ./helper/addr-tizen.c                                           \
+               ./helper/common_probe_init.c                            \
+               ./probe_memory/libdanew.cpp                                     \
+               ./probe_graphics/da_evas_gl.c                           \
+               ./probe_graphics/da_gl_api_init.c                       \
+               ./probe_graphics/da_gles20_tizen.cpp                    \
+               ./probe_graphics/da_gles20_native.cpp
 
 ASM_SRC = ./helper/da_call_original.S
 
@@ -106,7 +112,6 @@ TIZEN_OBJS = $(patsubst %.cpp,%.o, $(patsubst %.c,%.o, $(TIZEN_SRCS))) $(ASM_OBJ
 DUMMY_OBJS = $(patsubst %.c,%.o, $(DUMMY_SRCS))
 
 
-CAPI_TARGET = da_probe_capi.so
 TIZEN_TARGET = da_probe_tizen.so
 DUMMY_TARGET = libdaprobe.so
 
@@ -114,21 +119,24 @@ CPPFLAGS = $(INCLUDE_CPPFLAGS) -D_GNU_SOURCE -DSELF_LIB_NAME="\"/$(INSTALLDIR)/$
 CFLAGS = $(WARN_CFLAGS) -fPIC
 CXXFLAGS = $(WARN_CFLAGS) -fPIC
 
-TIZEN_CPPFLAGS = -DTIZENAPP
+TIZEN_CPPFLAGS = -DTIZENAPP $(SWAP_PROBE_DEFS)
 TIZEN_LDFLAGS = -lstdc++
 
 all:   capi tizen dummy
-capi:  headers $(CAPI_TARGET)
 tizen: headers $(TIZEN_TARGET)
 dummy: headers $(DUMMY_TARGET)
 
 $(ASM_OBJ): $(ASM_SRC)
        $(CC) $(ASMFLAG) -c $^ -o $@
 
+GENERATED_CONFIG = include/api_config.h
 GENERATED_HEADERS = include/api_id_mapping.h include/api_id_list.h include/id_list
-headers: $(GENERATED_HEADERS)
+headers: $(GENERATED_CONFIG) $(GENERATED_HEADERS)
 rmheaders:
-       rm -f $(GENERATED_HEADERS)
+       rm -f $(GENERATED_CONFIG) $(GENERATED_HEADERS)
+
+$(GENERATED_CONFIG): ./scripts/gen_api_config.sh
+       sh $< > $@
 
 include/api_id_mapping.h: ./scripts/gen_api_id_mapping_header.awk
 include/api_id_list.h: ./scripts/gen_api_id_mapping_header_list.awk
@@ -141,9 +149,6 @@ $(GENERATED_HEADERS): ./scripts/api_names.txt
 $(GENERATED_HEADERS):
        awk -f $< < $(APINAMES) > $@
 
-$(CAPI_TARGET): $(CAPI_OBJS)
-       $(CC) $(LDFLAGS) $^ -o $@
-
 $(TIZEN_TARGET): LDFLAGS+=$(TIZEN_LDFLAGS)
 $(TIZEN_TARGET): CPPFLAGS+=$(TIZEN_CPPFLAGS)
 $(TIZEN_TARGET): $(TIZEN_OBJS)