From 32479eab89de11df3f86a26b3d10dda6aa2f26a6 Mon Sep 17 00:00:00 2001
From: Yalu Zhang <yalu.zhang@iopsys.eu>
Date: Thu, 22 Oct 2020 11:58:17 +0200
Subject: [PATCH] Update makefile to generate libdect.so

---
 dspg_test_app/Makefile            |  5 ++++-
 dspg_test_app/src/test/Makefile   | 22 +++++++++++++++++-----
 dspg_test_app/src/test/tcx_cmbs.c |  2 ++
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/dspg_test_app/Makefile b/dspg_test_app/Makefile
index b548ac231..d067adf36 100644
--- a/dspg_test_app/Makefile
+++ b/dspg_test_app/Makefile
@@ -33,7 +33,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/$(PKG_NAME)
 	CATEGORY:=Utilities
  	TITLE:=DSPG test application
- 	DEPENDS:= +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen @(PACKAGE_bcmkernel||PACKAGE_bcmopen) +libubox +ubus +libpicoevent endptmngr
+ 	DEPENDS:= +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen @(PACKAGE_bcmkernel||PACKAGE_bcmopen) +libubox +ubus +libpicoevent
 endef
 
 define Package/$(PKG_NAME)/description
@@ -51,12 +51,15 @@ MAKE_FLAGS += \
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/etc/dect/
 	$(INSTALL_DIR) $(1)/etc/config/
 	$(INSTALL_DIR) $(1)/etc/init.d/
 
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/test/testout/cmbs_tcx $(1)/usr/sbin/
 	$(STRIP) $(1)/usr/sbin/cmbs_tcx
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/test/testout/libdect.so $(1)/usr/lib/
+	$(STRIP) $(1)/usr/lib/libdect.so
 	#$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/target.bin $(1)/etc/dect/
 	#$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/dect $(1)/etc/init.d/
 	#$(CP) ./files/dect.config $(1)/etc/config/dect
diff --git a/dspg_test_app/src/test/Makefile b/dspg_test_app/src/test/Makefile
index 007dea49a..e892bdcc3 100755
--- a/dspg_test_app/src/test/Makefile
+++ b/dspg_test_app/src/test/Makefile
@@ -149,8 +149,7 @@ includes += -I$(M5TINC)
 endif
 
 ################################################################################
-objects := $(OBJDIR)/tcx_cmbs.o
-objects += $(OBJDIR)/tcx_config.o
+objects := $(OBJDIR)/tcx_config.o
 objects += $(OBJDIR)/tcx_keyb.o
 objects += $(OBJDIR)/tcx_log.o
 objects += $(OBJDIR)/tcx_hostlog.o
@@ -274,7 +273,7 @@ ifdef CMBS_PLUGIN
 	LFLAGS+= -rdynamic -ldl 
 endif
 
-all:  dirs $(OUTDIR)/$(APPNAME)
+all:  dirs $(OUTDIR)/$(APPNAME) $(OUTDIR)/libdect.so
 
 dirs: $(OBJDIR) $(OUTDIR) $(LIBDIR)	
 
@@ -290,19 +289,32 @@ $(LIBDIR):
 $(CMBS_LIB):	$(cfr_objects) $(cmbs_objects)
 	$(ARCHIEVE) $(cfr_objects) $(cmbs_objects)
 
+$(OBJDIR)/tcx_cmbs.o: tcx_cmbs.c
+	$(CC) $(CFLAGS) $(includes) $(coptions) -c -o $@ $<
+
+$(OBJDIR)/tcx_cmbs_lib.o: tcx_cmbs.c
+	$(CC) $(CFLAGS) $(includes) $(coptions) -DGEN_LIBDECT -c -o $@ $<
+
 clean:
 	$(RM) -fr $(OBJDIR) $(OUTDIR) $(LIBDIR)
 
 mframe:
 	$(LINK) -shared -nostartfiles -o libRTPFramePlugin.so mframe_plugin.c cfifo.c rtp_jpeg.c frame_jpeg.c -lrt -lmem -lcoma -lpthread -L$(LIBMEM) -I$(LIBMEM) -I$(LIBCOMA)/inc -I$(LIBCOMA) -DUSE_COMA_SOCK -DCMBS_FRAME_DATA_RT -DCMBS_BUF_SIZE=$(CMBS_BUF_SIZE) -L $(COMA_LIB_DIR) -I$(PROJDIR)$(SL)include -I$(PROJDIR)$(SL)cmbs
 
-$(OUTDIR)/$(APPNAME): $(CMBS_LIB) $(objects) 
+$(OUTDIR)/$(APPNAME): $(CMBS_LIB) $(OBJDIR)/tcx_cmbs.o $(objects) 
 ifeq ($(HOST_OS),WIN32)
 	$(LINK)  $(LFLAGS) $(objects) $(linkpath)
 else
 ifeq ($(MEDIA5),1) 
-	g++  -g $(objects) -L$(M5TLIBDIR) -lsipclient -lwebrtc -lopus -lexpat -lX11  $(LFLAGS) $(linkpath)
+	g++  -g $(OBJDIR)/tcx_cmbs.o $(objects) -L$(M5TLIBDIR) -lsipclient -lwebrtc -lopus -lexpat -lX11  $(LFLAGS) $(linkpath)
 else
 	$(CC) $(CFLAGS) $(LFLAGS) -o $@ $^ $(LIBS) -L$(PROJDIR)/lib
 endif
 endif
+
+$(OUTDIR)/libdect.so: $(CMBS_LIB) $(OBJDIR)/tcx_cmbs_lib.o $(objects) 
+ifeq ($(MEDIA5),1) 
+	g++  -g $(OBJDIR)/tcx_cmbs_lib.o $(objects) -L$(M5TLIBDIR) -lsipclient -lwebrtc -lopus -lexpat -lX11  $(LFLAGS) $(linkpath)
+else
+	$(CC) $(CFLAGS) $(LFLAGS) -shared -o $@ $^ $(LIBS) -L$(PROJDIR)/lib
+endif
diff --git a/dspg_test_app/src/test/tcx_cmbs.c b/dspg_test_app/src/test/tcx_cmbs.c
index c1da4f06c..f0346528e 100644
--- a/dspg_test_app/src/test/tcx_cmbs.c
+++ b/dspg_test_app/src/test/tcx_cmbs.c
@@ -242,6 +242,7 @@ u8 tcx_DetectUSBDongle(void)
     return tcx_DetectComPort(FALSE, &e_type);
 }
 
+#ifndef GEN_LIBDECT
 int main(int argc, char **argv)
 {
     char *psz_XMLFile = NULL;
@@ -817,5 +818,6 @@ int main(int argc, char **argv)
     printf("Press ENTER to exit...");
     return getchar();
 }
+#endif // End of GEN_LIBDECT
 
 //*/