changed shared library to static archive

diff --git a/Makefile b/Makefile
index 105324c..1f46d76 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,11 +15,13 @@ OBJ_SRC_DIR         := interface
 PKG_DIRS               := devicemgr discoverymgr interface restapi/v1 servicemgr
 
 # CMain target
-HEADER_FILE_C  := liborchestration.h
-OBJECT_FILE_C  := liborchestration.so
+ORG_HEADER_FILE_C      := liborchestration.h
+HEADER_FILE_C  := orchestration.h
+OBJECT_FILE_C  := liborchestration.a
 CMAIN_DIR              := $(BASE_DIR)/src/CMain
 CMAIN_INC_DIR  := $(CMAIN_DIR)/inc
 CMAIN_BIN_DIR  := $(CMAIN_DIR)/bin
+CMAIN_LIB_DIR  := $(CMAIN_DIR)/lib
 
 
 
@@ -38,7 +40,8 @@ build-binary:
 
 ## edge-orchestration shared object build
 build-object:
-       CGO_ENABLED=1 $(GOBUILD) -o $(CMAIN_INC_DIR)/$(OBJECT_FILE_C) -buildmode=c-shared -linkshared $(OBJ_SRC_DIR) || exit 1
+       CGO_ENABLED=1 $(GOBUILD) -o $(CMAIN_LIB_DIR)/$(OBJECT_FILE_C) -buildmode=c-archive $(OBJ_SRC_DIR) || exit 1
+       mv $(CMAIN_LIB_DIR)/$(ORG_HEADER_FILE_C) $(CMAIN_INC_DIR)/$(HEADER_FILE_C)
 
 ## go test and coverage
 test:
@@ -50,8 +53,8 @@ test:
 ## build clean
 clean:
        $(GOCLEAN)
-       -rm -f $(CMAIN_DIR)/$(OBJECT_FILE_C)
-       -rm -f $(CMAIN_DIR)/$(HEADER_FILE_C)
+       -rm -f $(CMAIN_INC_DIR)/$(HEADER_FILE_C)
+       -rm -f $(CMAIN_LIB_DIR)/$(OBJECT_FILE_C)
        -rm -f $(BIN_DIR)/*
 
 ## check go style and static analysis

diff --git a/src/CMain/Makefile b/src/CMain/Makefile
index 0bff023..fe054ca 100644 (file)
--- a/src/CMain/Makefile
+++ b/src/CMain/Makefile
@@ -10,7 +10,7 @@ all: orchestration
 # lt; -o $@
 
 orchestration: main.o dbus_interface.o
-       $(CC) -g -Wall -Werror ./src/main.o ./src/dbus_interface.o -o ./bin/orchestration -I ./inc `pkg-config --libs --cflags gio-2.0 gio-unix-2.0 glib-2.0 dbus-glib-1 dbus-1`
+       $(CC) -g -Wall -Werror ./src/main.o ./src/dbus_interface.o -o ./bin/orchestration -I ./inc `pkg-config --libs --cflags gio-2.0 gio-unix-2.0 glib-2.0 dbus-glib-1 dbus-1` -L./lib -lorchestration
 
 main.o: ./src/main.c
        $(CC) -Wall ./src/main.c -c -o ./src/main.o -I ./inc `pkg-config --libs --cflags glib-2.0`

diff --git a/src/CMain/bin/orchestration b/src/CMain/bin/orchestration
index 5596b8a..1168c30 100755 (executable)
Binary files a/src/CMain/bin/orchestration and b/src/CMain/bin/orchestration differ

diff --git a/src/CMain/inc/liborchestration.so b/src/CMain/inc/liborchestration.so
deleted file mode 100644 (file)
index 45cf92f..0000000
Binary files a/src/CMain/inc/liborchestration.so and /dev/null differ

diff --git a/src/CMain/inc/liborchestration.h b/src/CMain/inc/orchestration.h
similarity index 100%
rename from src/CMain/inc/liborchestration.h
rename to src/CMain/inc/orchestration.h

diff --git a/src/CMain/lib/liborchestration.a b/src/CMain/lib/liborchestration.a
new file mode 100644 (file)
index 0000000..2d7e4a7
Binary files /dev/null and b/src/CMain/lib/liborchestration.a differ

diff --git a/src/CMain/src/main.c b/src/CMain/src/main.c
index 0f38e54..cf6c29d 100644 (file)
--- a/src/CMain/src/main.c
+++ b/src/CMain/src/main.c
@@ -2,6 +2,7 @@
 #include <gio/gio.h>
 
 #include <dbus_interface.h>
+#include <orchestration.h>
 
 void request_cb(char* app_name, char* service_info){
        printf("app_name : %s\n", app_name);
@@ -11,6 +12,7 @@ void request_cb(char* app_name, char* service_info){
 int main(void){
        int result;
        GMainLoop *loop;
+       OrchestrationInit();
        result = orch_dbus_initialize(request_cb);
        if(result != ORCH_ERROR_NONE){
                printf("dbus error\n");