- Restored compilation of most tests (The part using previously named p3ConnectMgr is still to be done).

- moved ftSearchDummy and ftDataSendPair in tests/ft since it is only used there.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6009 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libretroshare/src/tests/scripts/config-linux.mk

@@ -22,11 +22,12 @@ RM = /bin/rm
 RANLIB = ranlib
 LIBDIR = $(RS_TOP_DIR)/lib
 BITDIR = $(DHT_TOP_DIR)/lib
+OPSDIR = $(OPS_TOP_DIR)/lib
 LIBRS = $(LIBDIR)/libretroshare.a
 BITDHT = $(BITDIR)/libbitdht.a
 # Unix: Linux/Cygwin
 INCLUDE = -I $(RS_TOP_DIR)  -I$(OPENPGP_INCLUDE_DIR)
-CFLAGS = -Wall -g $(INCLUDE)
+CFLAGS = -Wall -g $(INCLUDE) -I..
 #CFLAGS += -fprofile-arcs -ftest-coverage
 CFLAGS += ${DEFINES}
 
@@ -58,8 +59,11 @@ BIOCFLAGS =  -I $(SSL_DIR)/include ${DEFINES} -DOPENSSL_THREADS -D_REENTRANT -DD
 # OS specific Linking.
 #########################################################################
 
-LIBS =  -lgpgme -L$(LIBDIR) -lretroshare 
+LIBS =  -L$(LIBDIR) -lretroshare 
 LIBS +=  -L$(BITDIR) -lbitdht -lgnome-keyring
+LIBS += -L$(OPSDIR) -lops
+LIBS += -lixml -lbz2
+
 ifdef PQI_USE_XPGP
 	LIBS +=  -L$(SSL_DIR) 
   endif

libretroshare/src/tests/scripts/config-macosx.mk

@@ -40,6 +40,7 @@ RANLIB = ranlib
 # Dummy ranlib -> can't do it until afterwards with universal binaries.
 # RANLIB = ls -l 
 
+OPSDIR = $(OPS_TOP_DIR)/lib
 BITDIR = $(DHT_TOP_DIR)/lib
 LIBDIR = $(RS_TOP_DIR)/lib
 LIBRS = $(LIBDIR)/libretroshare.a
@@ -83,8 +84,9 @@ LIBS = -Wl,-search_paths_first
 # LIBS += -arch ppc -arch i386
 #LIBS += -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5u.sdk 
 
-LIBS =  -lgpgme -L$(LIBDIR) -lretroshare
+LIBS =  -L$(LIBDIR) -lretroshare
 LIBS +=  -L$(BITDIR) -lbitdht 
+LIBS += -L$(OPSDIR) -lops
 ifdef PQI_USE_XPGP
         LIBS +=  -L$(SSL_DIR)
   endif