update:make file

Author: xengine-qyt

XEngine_Source/Makefile

@@ -3,27 +3,29 @@ UNICODE = 0
 PLATFORM=linux
 FLAGS= 
 
-THIRD_JSONCPP_PATH = ./XEngine_ThirdPart/jsoncpp
+THIRD_JSONCPP_PATH = ./XEngine_Depend/XEngine_Module/jsoncpp
+THIRD_REPORT_PATH = ./XEngine_Depend/XEngine_Module/XEngine_InfoReport
 
 BASE_SQL_PATH = ./StorageModule_Database
 BASE_CONFIG_PATH = ./StorageModule_Config
 BASE_SESSION_PATH = ./StorageModule_Session
 BASE_APIHELP_PATH = ./StorageModule_APIHelp
 BASE_PROTOCOL_PATH = ./StorageModule_Protocol
 BASE_BTORRENT_PATH = ./StorageModule_BTorrent
-BASE_INFOREPORT_PATH = ./StorageModule_InfoReport
 
 APPSERVICE_STORAGE_PATH = ./XEngine_StorageApp
 
-XENGINE_MODULES = libjsoncpp.so                                                          \
-                libStorageModule_Database.so libStorageModule_Config.so libStorageModule_Session.so libStorageModule_APIHelp.so libStorageModule_Protocol.so libStorageModule_BTorrent.so libStorageModule_InfoReport.so       \
+XENGINE_MODULES = libjsoncpp.so libXEngine_InfoReport.so                                   \
+                libStorageModule_Database.so libStorageModule_Config.so libStorageModule_Session.so libStorageModule_APIHelp.so libStorageModule_Protocol.so libStorageModule_BTorrent.so    \
 		 		XEngine_StorageApp.exe 
 
 .PHONY:MakeAll 
 MakeAll:$(XENGINE_MODULES)
 
 libjsoncpp.so:
 	make -C $(THIRD_JSONCPP_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
+libXEngine_InfoReport.so:
+	make -C $(THIRD_REPORT_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
 
 libStorageModule_Database.so:
 	make -C $(BASE_SQL_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
@@ -37,8 +39,6 @@ libStorageModule_Protocol.so:
 	make -C $(BASE_PROTOCOL_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
 libStorageModule_BTorrent.so:
 	make -C $(BASE_BTORRENT_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
-libStorageModule_InfoReport.so:
-	make -C $(BASE_INFOREPORT_PATH) PLATFORM=$(PLATFORM) $(FLAGS)
 
 XEngine_StorageApp.exe:
 	make -C $(APPSERVICE_STORAGE_PATH) PLATFORM=$(PLATFORM) $(FLAGS)

XEngine_Source/StorageModule_APIHelp/Makefile

@@ -6,8 +6,8 @@ FILEEXT =
 LIBFLAG = 
 RELEASE = 0
 UNICODE = 0
-LOADHDR = -I ./ -I ../XEngine_ThirdPart/jsoncpp
-LOADSO = -L ../XEngine_ThirdPart/jsoncpp
+LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
+LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
 LIB = -lXEngine_BaseLib -lXEngine_OPenSsl -lRfcComponents_HttpProtocol -lXEngine_SystemApi -ljsoncpp
 LIBEX = 
 OBJECTS = APIHelp_Distributed.o APIHelp_Api.o pch.o

XEngine_Source/StorageModule_Config/Makefile

@@ -6,8 +6,8 @@ FILEEXT =
 LIBFLAG = 
 RELEASE = 0
 UNICODE = 0
-LOADHDR = -I ./ -I ../XEngine_ThirdPart/jsoncpp
-LOADSO = -L ../XEngine_ThirdPart/jsoncpp
+LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
+LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
 LIB = -ljsoncpp
 LIBEX = 
 OBJECTS = Config_Json.o pch.o

XEngine_Source/StorageModule_Protocol/Makefile

@@ -6,8 +6,8 @@ FILEEXT =
 LIBFLAG = 
 RELEASE = 0
 UNICODE = 0
-LOADHDR = -I ./ -I ../XEngine_ThirdPart/jsoncpp
-LOADSO = -L ../XEngine_ThirdPart/jsoncpp
+LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
+LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
 LIB = -lXEngine_BaseLib -ljsoncpp
 LIBEX = 
 OBJECTS = Protocol_StoragePacket.o Protocol_StorageParse.o pch.o

XEngine_Source/StorageModule_Session/Makefile

@@ -6,7 +6,7 @@ FILEEXT =
 LIBFLAG = 
 RELEASE = 0
 UNICODE = 0
-LOADHDR = -I ./ -I ../XEngine_ThirdPart/jsoncpp
+LOADHDR = -I ./
 LOADSO = 
 LIB = -lXEngine_BaseLib
 LIBEX = 

XEngine_Source/XEngine_StorageApp/Makefile

@@ -4,11 +4,12 @@ PLATVER =
 PLATDIR = 
 RELEASE = 0
 UNICODE = 0
-LOADHDR = -I ./ -I ../XEngine_ThirdPart/jsoncpp
-LOADSO = -L ../StorageModule_Database -L ../StorageModule_Config -L ../StorageModule_Session -L ../StorageModule_APIHelp -L ../StorageModule_Protocol -L ../StorageModule_BTorrent -L ../StorageModule_InfoReport  -L ../XEngine_ThirdPart/jsoncpp
+LOADHDR = -I ./ 
+LOADSO =  -L ../XEngine_Depend/XEngine_Module/jsoncpp -L ../XEngine_Depend/XEngine_Module/XEngine_InfoReport \
+          -L ../StorageModule_Database -L ../StorageModule_Config -L ../StorageModule_Session -L ../StorageModule_APIHelp -L ../StorageModule_Protocol -L ../StorageModule_BTorrent -L ../StorageModule_InfoReport
 LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_OPenSsl -lXClient_APIHelp -lXEngine_ProcFile -lXEngine_SystemApi -lHelpComponents_XLog -lHelpComponents_Packets -lRfcComponents_HttpProtocol \
-      -lStorageModule_Database -lStorageModule_Config -lStorageModule_Session -lStorageModule_APIHelp -lStorageModule_Protocol -lStorageModule_BTorrent -lStorageModule_InfoReport \
-	  -ljsoncpp
+      -lStorageModule_Database -lStorageModule_Config -lStorageModule_Session -lStorageModule_APIHelp -lStorageModule_Protocol -lStorageModule_BTorrent  \
+	  -ljsoncpp -lXEngine_InfoReport
 LIBEX = 
 OBJECTS = StorageApp_Config.o StorageApp_Download.o StorageApp_Network.o StorageApp_Center.o StorageApp_UPLoader.o Storage_TaskPass.o Storage_TaskManage.o Storage_TaskP2p.o XEngine_StorageApp.o