From 0a9382cea5af53e1297bd750aa760ddda862d449 Mon Sep 17 00:00:00 2001 From: drbob Date: Thu, 6 Mar 2008 12:07:54 +0000 Subject: [PATCH] Moved p3notify to pqi directory to fix compile order. This is a bit of a hack, and should be fixed later. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@379 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/pqi/Makefile | 5 ++++- libretroshare/src/{rsserver => pqi}/p3notify.cc | 2 +- libretroshare/src/{rsserver => pqi}/p3notify.h | 0 libretroshare/src/rsserver/Makefile | 1 - libretroshare/src/rsserver/p3face-startup.cc | 3 ++- 5 files changed, 7 insertions(+), 4 deletions(-) rename libretroshare/src/{rsserver => pqi}/p3notify.cc (98%) rename libretroshare/src/{rsserver => pqi}/p3notify.h (100%) diff --git a/libretroshare/src/pqi/Makefile b/libretroshare/src/pqi/Makefile index d031824eb..1a7fcea3e 100644 --- a/libretroshare/src/pqi/Makefile +++ b/libretroshare/src/pqi/Makefile @@ -24,12 +24,15 @@ endif SSL_OBJ += pqissl.o pqissllistener.o pqisslpersongrp.o UDP_OBJ = pqissludp.o +OTHER_OBJ = p3notify.o + RSOBJ = $(BASE_OBJ) $(LOOP_OBJ) \ $(STREAM_OBJ) \ $(MGR_OBJ) \ $(SSL_OBJ) \ $(UDP_OBJ) \ - $(GRP_OBJ) + $(GRP_OBJ) \ + $(OTHER_OBJ) TESTOBJ = net_test.o dht_test.o #conn_test.o diff --git a/libretroshare/src/rsserver/p3notify.cc b/libretroshare/src/pqi/p3notify.cc similarity index 98% rename from libretroshare/src/rsserver/p3notify.cc rename to libretroshare/src/pqi/p3notify.cc index 86bd90a5f..0b1aedd6d 100644 --- a/libretroshare/src/rsserver/p3notify.cc +++ b/libretroshare/src/pqi/p3notify.cc @@ -24,7 +24,7 @@ */ -#include "rsserver/p3notify.h" +#include "pqi/p3notify.h" /* external reference point */ RsNotify *rsNotify = NULL; diff --git a/libretroshare/src/rsserver/p3notify.h b/libretroshare/src/pqi/p3notify.h similarity index 100% rename from libretroshare/src/rsserver/p3notify.h rename to libretroshare/src/pqi/p3notify.h diff --git a/libretroshare/src/rsserver/Makefile b/libretroshare/src/rsserver/Makefile index d7360b2f7..4d6182c25 100644 --- a/libretroshare/src/rsserver/Makefile +++ b/libretroshare/src/rsserver/Makefile @@ -11,7 +11,6 @@ RSOBJ = p3peers.o \ p3rank.o \ p3photo.o \ p3msgs.o \ - p3notify.o \ p3discovery.o \ p3face-file.o \ p3face-server.o \ diff --git a/libretroshare/src/rsserver/p3face-startup.cc b/libretroshare/src/rsserver/p3face-startup.cc index 94c495a63..df869b415 100644 --- a/libretroshare/src/rsserver/p3face-startup.cc +++ b/libretroshare/src/rsserver/p3face-startup.cc @@ -58,7 +58,6 @@ /* Implemented Rs Interfaces */ #include "rsserver/p3face.h" -#include "rsserver/p3notify.h" #include "rsserver/p3peers.h" #include "rsserver/p3rank.h" #include "rsserver/p3msgs.h" @@ -66,6 +65,8 @@ #include "rsserver/p3photo.h" #include "rsiface/rsgame.h" +#include "pqi/p3notify.h" // HACK - moved to pqi for compilation order. + /**************** PQI_USE_XPGP ******************/ #if defined(PQI_USE_XPGP) #include "pqi/authxpgp.h"