From 7293cd3afa91e205ebdf59b41796b23bda43479f Mon Sep 17 00:00:00 2001 From: csoler Date: Mon, 21 Sep 2015 22:58:58 -0400 Subject: [PATCH] updated ubuntu changelog --- build_scripts/Debian+Ubuntu/changelog | 85 +++++++++++++---- libbitdht/src/bitdht/Makefile | 44 --------- libbitdht/src/example/Makefile | 16 ---- libbitdht/src/tests/Makefile | 91 ------------------ libresapi/src/webui/Makefile | 36 ------- libretroshare/src/pqi/Makefile | 77 --------------- libretroshare/src/retroshare/Makefile | 25 ----- libretroshare/src/rsserver/Makefile | 35 ------- libretroshare/src/services/Makefile | 36 ------- libretroshare/src/tests/dbase/Makefile | 55 ----------- libretroshare/src/tests/ft/Makefile | 60 ------------ libretroshare/src/tests/general/Makefile | 32 ------- libretroshare/src/tests/pgp/Makefile | 39 -------- libretroshare/src/tests/pqi/Makefile | 93 ------------------- libretroshare/src/tests/serialiser/Makefile | 92 ------------------ libretroshare/src/tests/services/Makefile | 33 ------- libretroshare/src/tests/tcponudp/Makefile | 83 ----------------- libretroshare/src/tests/upnp/Makefile | 23 ----- libretroshare/src/tests/util/Makefile | 31 ------- libretroshare/src/turtle/Makefile | 23 ----- libretroshare/src/upnp/Makefile | 28 ------ libretroshare/src/util/Makefile | 27 ------ rsctrl/src/Makefile | 33 ------- supportlibs/pegmarkdown/peg-0.1.9/Makefile | 65 ------------- .../pegmarkdown/peg-0.1.9/examples/Makefile | 88 ------------------ 25 files changed, 67 insertions(+), 1183 deletions(-) delete mode 100644 libbitdht/src/bitdht/Makefile delete mode 100644 libbitdht/src/example/Makefile delete mode 100644 libbitdht/src/tests/Makefile delete mode 100644 libresapi/src/webui/Makefile delete mode 100644 libretroshare/src/pqi/Makefile delete mode 100644 libretroshare/src/retroshare/Makefile delete mode 100644 libretroshare/src/rsserver/Makefile delete mode 100644 libretroshare/src/services/Makefile delete mode 100644 libretroshare/src/tests/dbase/Makefile delete mode 100644 libretroshare/src/tests/ft/Makefile delete mode 100644 libretroshare/src/tests/general/Makefile delete mode 100644 libretroshare/src/tests/pgp/Makefile delete mode 100644 libretroshare/src/tests/pqi/Makefile delete mode 100644 libretroshare/src/tests/serialiser/Makefile delete mode 100644 libretroshare/src/tests/services/Makefile delete mode 100644 libretroshare/src/tests/tcponudp/Makefile delete mode 100644 libretroshare/src/tests/upnp/Makefile delete mode 100644 libretroshare/src/tests/util/Makefile delete mode 100644 libretroshare/src/turtle/Makefile delete mode 100644 libretroshare/src/upnp/Makefile delete mode 100644 libretroshare/src/util/Makefile delete mode 100644 rsctrl/src/Makefile delete mode 100644 supportlibs/pegmarkdown/peg-0.1.9/Makefile delete mode 100644 supportlibs/pegmarkdown/peg-0.1.9/examples/Makefile diff --git a/build_scripts/Debian+Ubuntu/changelog b/build_scripts/Debian+Ubuntu/changelog index 4fa99bacc..ce726c179 100644 --- a/build_scripts/Debian+Ubuntu/changelog +++ b/build_scripts/Debian+Ubuntu/changelog @@ -1,20 +1,69 @@ retroshare06 (0.6.0-1.XXXXXX~YYYYYY) YYYYYY; urgency=low - - 6bc6e22 ( ) Merge pull request #92 from AsamK/fix_travis_voip - f2994b7 (VOIP ) Old libav versions used constant without AV_ prefix - efc057e (VOIP ) Fix build with libavcodec < 55 - 7385dd1 ( ) Merge pull request #91 from AsamK/fix_opensuse_compile - fd19349 ( ) Merge pull request #90 from PhenomRetroShare/Fix_Travis_CI_Compilation - 976f53b (VOIP ) Remove -lavformat from VOIP, it's unused - 484edc3 (VOIP ) Fix build for openSUSE - 22816f0 (VOIP ) Remove unnecessary includes from VideoProcessor - 6b94248 (VOIP ) Fix Travis CI compilation by adding libavutil-dev package. - c892f8a (VOIP ) Merge pull request #85 from PhenomRetroShare/Fix_VOIP_CompilWithRecentLibavutil - 0a84398 (VOIP ) Fix VOIP compilation with recent libavutil-dev package. /usr/include/libavutil/common.h error 'UINT64C' was n - 6614536 (VOIP ) Added register of codecs to VOIP. - 738dada (VOIP ) Fixed Windows compile of VOIP. - 9bbdefa (Packaging ) Added "QMAKE_LFLAGS += -Wl,--start-group" to pluigns for Windows compile. - b1b2de6 (Packaging ) Fixed Windows compile. - Set name for prl file in libretroshare.pro - Use "QMAKE_LFLAGS += -Wl,--start-group" + + 1d54630 thunder2 17 Sep 2015 10:05:31 +0200 Fixed Windows compile. + 66691d4 Cyril Soler 16 Sep 2015 20:01:39 -0400 Merge pull request #108 from sehraf/i2p + 04abfad sehraf 16 Sep 2015 17:01:20 +0200 manually reverted changes by Qt Creator + 7c7e4f8 sehraf 16 Sep 2015 12:13:54 +0200 added ip addr. field to the add certificate dialog + 6202e83 sehraf 16 Sep 2015 11:48:32 +0200 add default case to gui instead of falling back to tor labeling + d3d184f sehraf 16 Sep 2015 11:09:04 +0200 added simple step-by-step guide to add a I2P server tunnel + e54358a sehraf 16 Sep 2015 10:55:33 +0200 added simple step-by-step guide to add a I2P client tunnel + 1dd3375 sehraf 15 Sep 2015 17:14:55 +0200 hide debug output + d24b281 sehraf 15 Sep 2015 17:10:48 +0200 optimizations * reduced calls to mPeermgr * use switch convenience * small fixes + bfcf43f sehraf 15 Sep 2015 16:18:46 +0200 fixed connection type detection and other small things + 8725aab sehraf 14 Sep 2015 15:14:39 +0200 gui fixes + 6b87c38 sehraf 14 Sep 2015 14:56:14 +0200 small fixes + 6ec1919 sehraf 14 Sep 2015 12:39:46 +0200 gui changes + b0251e3 sehraf 14 Sep 2015 12:12:28 +0200 generalized tooltips + 4b19e73 sehraf 14 Sep 2015 09:56:43 +0200 added comments to functions + 900e51b Cyril Soler 13 Sep 2015 18:08:06 -0400 Merge pull request #107 from PhenomRetroShare/AddFriendListItemMouseEvents + 48e6618 Phenom 13 Sep 2015 19:00:31 +0200 Send Mouse event to FriendList's item, since ElidedLabel was fixed. + 7195d4c Cyril Soler 10 Sep 2015 09:41:28 -0400 Merge pull request #105 from ericthefish/master + 4880fc4 Ivan Lucas 10 Sep 2015 11:21:01 +0100 Fixed grammar on add friend wizard by rewording slightly + 840e930 Ivan Lucas 10 Sep 2015 10:29:15 +0100 Fix Spelling and Grammar + 770e934 Ivan Lucas 10 Sep 2015 10:18:14 +0100 Merge remote-tracking branch 'upstream/master' + 4a0539c Cyril Soler 9 Sep 2015 19:57:07 -0400 Merge pull request #103 from AsamK/html_parsing + 1acd4a3 Cyril Soler 9 Sep 2015 16:44:59 -0400 Merge pull request #104 from PhenomRetroShare/Fix_ElidedLabel_mousePresEvent + ce9fc7b Phenom 9 Sep 2015 22:37:38 +0200 Fix ElidedLabel::mousePressEvent. + 75a7a89 Ivan Lucas 9 Sep 2015 15:19:17 +0100 Fix typo + 7aad9c1 AsamK 9 Sep 2015 13:36:00 +0200 Improve HTML parsing in libresapi + b8c3c89 AsamK 9 Sep 2015 11:53:01 +0200 Extract getPlainText method + ebd5da5 thunder2 8 Sep 2015 16:34:22 +0200 Optimizations in RsGenExchange, p3GxsForums and p3GxsChannels. - Removed not used variables + avoid copy constructors - Use swap instead of operator= to move elements of std containers + 490b88c Cyril Soler 8 Sep 2015 14:17:29 -0400 Merge pull request #100 from ericthefish/master + a2e7e4d Ivan Lucas 8 Sep 2015 16:12:50 +0100 Fixed spelling/grammar + 4f8b098 Ivan Lucas 8 Sep 2015 16:00:00 +0100 Fixing spelling + c4061fc thunder2 7 Sep 2015 22:27:04 +0200 Removed not used time consuming calculation of row count from RetroCursor. + 29a1fa2 thunder2 7 Sep 2015 21:48:18 +0200 Removed unnecessary copy of results in RsGxsDataAccess. + 0bc77d7 sehraf 8 Sep 2015 13:48:30 +0200 added some error handling + da417ee Cyril Soler 7 Sep 2015 20:38:47 -0400 Merge pull request #96 from AsamK/qmake_3 + 63e38af Cyril Soler 7 Sep 2015 20:36:03 -0400 Merge pull request #94 from AsamK/correct_libav_version + 03d99ae sehraf 7 Sep 2015 23:55:57 +0200 made GenCertDislog more generic + 4fc6c73 sehraf 7 Sep 2015 23:40:52 +0200 replaced some ifs with switch + e2768e0 defnax 7 Sep 2015 23:34:39 +0200 Added last used field to Person Details Window + fed4345 sehraf 7 Sep 2015 22:57:54 +0200 made server settings more generic and added i2p support + 95d6b06 sehraf 7 Sep 2015 18:46:19 +0200 first working version + 0107f4e sehraf 7 Sep 2015 12:59:21 +0200 first run on gui integration + ba74c04 sehraf 7 Sep 2015 11:51:24 +0200 removed duplicated code, fixed compile, few additions + c17d0e1 sehraf 7 Sep 2015 11:22:15 +0200 add i2p support to libretroshare + 2c1743f defnax 7 Sep 2015 15:13:32 +0200 Added send message function for Participants list. + cc4be39 defnax 7 Sep 2015 15:08:56 +0200 Merge branch 'master' of https://github.com/RetroShare/RetroShare + 0793a6a AsamK 6 Sep 2015 14:19:21 +0200 Use PLUGIN_DIR to define plugin directory only once + fe1ec9d AsamK 5 Sep 2015 22:49:57 +0200 Fixed mac compile. Moved sqlcipher.a to libretroshare.pro + 571336e AsamK 5 Sep 2015 23:49:15 +0200 Move duplicate common stuff out of platform parts + 66b9557 AsamK 5 Sep 2015 23:48:24 +0200 Use PKGCONFIG instead of manually specifying LIBS for Linux + b8e3a43 thunder2 6 Sep 2015 21:28:34 +0200 Auto download of recommended files adds the sender as source of the download. + 5f36500 thunder2 6 Sep 2015 14:21:05 +0200 Fixed click in column "Friend nodes" in FriendList. + 869077b thunder2 5 Sep 2015 12:46:18 +0200 Combined selects in RsDataService::retrieveNxsGrps/RsDataService::retrieveNxsMsgs. + d6f50c7 AsamK 5 Sep 2015 15:44:10 +0200 Fix libav version check + e9a5523 defnax 5 Sep 2015 00:16:07 +0200 Merge branch 'master' of https://github.com/RetroShare/RetroShare + 7f8dae9 defnax 4 Sep 2015 16:33:43 +0200 Merge branch 'master' of https://github.com/RetroShare/RetroShare + 07c5030 defnax 3 Sep 2015 17:41:30 +0200 Merge branch 'master' of https://github.com/RetroShare/RetroShare + 3d6e978 defnax 2 Sep 2015 13:06:15 +0200 Fixed Status Label on Distant Chat + + -- Cyril Soler Mon, 21 Sep 2015 20:00:00 +0100 + +retroshare06 (0.6.0-1.20150905.8bb76c95~trusty) trusty; urgency=low + a276986 ( ) Merge pull request #60 from PhenomRetroShare/Fix_AllowChatTextFormatOption 88a6931 (GUI ) Allow Chat Text Format Option working. 0b5b20d ( ) Merge pull request #59 from AsamK/qmake_improvements @@ -113,9 +162,9 @@ retroshare06 (0.6.0-1.XXXXXX~YYYYYY) YYYYYY; urgency=low 4d7f733 (Packaging ) fixed bug in git parameter in packaging script 9734f32 (Packaging ) updated ubuntu changelog. improved ubuntu packaging script - -- Cyril Soler Sun, 16 Aug 2015 20:00:00 +0100 + -- Cyril Soler Sun, 05 Sep 2015 20:00:00 +0100 -retroshare06 (0.6.0-1.20150816~9734f32a) trusty; urgency=low +retroshare06 (0.6.0-1.20150816.9734f32a~trusty) trusty; urgency=low f6b830d (branch merging) Merge pull request #35 from hunbernd/chat-fix 16859a1 (GUI ) Fix: chatlobby toaster not working diff --git a/libbitdht/src/bitdht/Makefile b/libbitdht/src/bitdht/Makefile deleted file mode 100644 index 60e7b510b..000000000 --- a/libbitdht/src/bitdht/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -CPPFLAGS += -g -Wall -D BE_DEBUG -lpthread -LDFLAGS += -g -Wall -D BE_DEBUG -lpthread -CFLAGS += -g -Wall -D BE_DEBUG -CC = g++ -LIB = -lpthread -CPPLIB = -lpthread - -EXEC = bdmsgs_test bdmetric_test bdquery_test bdspace_test bdspace_test2 bdnode_test bdnode_test2 bdstore_test -EXEC += bdnode_multitest1 bdmidids_test -EXEC += udpbitdht_nettest bencode_test -EXEC += bdmgr_multitest -#EXEC += bdudp_test - -all: $(EXEC) - -OBJ = bencode.o bdmsgs.o bdobj.o -OBJ += bdpeer.o bdquery.o bdnode.o bdstore.o bdhash.o -OBJ += bdmanager.o bdstddht.o - -# udp base objs -OBJ += bdthreads.o udplayer.o udpstack.o -OBJ += udpbitdht.o - -bdmsgs_test: $(OBJ) bdmsgs_test.o -bdmetric_test: $(OBJ) bdmetric_test.o -bdquery_test: $(OBJ) bdquery_test.o -bdspace_test: $(OBJ) bdspace_test.o -bdspace_test2: $(OBJ) bdspace_test2.o -bdnode_test: $(OBJ) bdnode_test.o -bdnode_test2: $(OBJ) bdnode_test2.o -bdmidids_test: $(OBJ) bdmidids_test.o - -bdnode_multitest1: $(OBJ) bdnode_multitest1.o -bdmgr_multitest: $(OBJ) bdmgr_multitest.o - -bdstore_test: $(OBJ) bdstore_test.o -bdudp_test: $(OBJ) bdudp_test.o -udpbitdht_nettest: $(OBJ) udpbitdht_nettest.o -bencode_test: $(OBJ) bencode_test.o - -clean: - rm -f *.o core $(EXEC) - -.PHONY: all clean diff --git a/libbitdht/src/example/Makefile b/libbitdht/src/example/Makefile deleted file mode 100644 index 447407bb9..000000000 --- a/libbitdht/src/example/Makefile +++ /dev/null @@ -1,16 +0,0 @@ - -CXXFLAGS = -Wall -g -I.. -#CXXFLAGS += -arch i386 # OSX - -LIBS = -L../lib -lbitdht -lpthread - - - -EXEC : bssdht - -EGOBJ = bdhandler.o bssdht.o bootstrap_fn.o - -bssdht: $(EGOBJ) - $(CXX) $(CXXFLAGS) -o bssdht $(EGOBJ) $(LIBS) - - diff --git a/libbitdht/src/tests/Makefile b/libbitdht/src/tests/Makefile deleted file mode 100644 index 5d6cc7f5c..000000000 --- a/libbitdht/src/tests/Makefile +++ /dev/null @@ -1,91 +0,0 @@ - -LIB_TOP_DIR = .. -TEST_TOP_DIR = $(LIB_TOP_DIR)/tests - -##### Define any flags that are needed for this section ####### -############################################################### - -############################################################### -include $(TEST_TOP_DIR)/scripts/config.mk -############################################################### - -# Generic Test Harnesses. -TESTOBJ = bdmetric_test.o bdmsgs_test.o bdnode_test.o bdspace_test.o -TESTOBJ += bdmgr_multitest.o bdquery_test.o bdstore_test.o -TESTOBJ += bdmidids_test.o bdspace_test2.o udpbitdht_nettest.o -TESTOBJ += bdbloom_test.o bdbloom_makefilter.o -#TESTOBJ += bencode_test.o bdudp_test.o -#TESTOBJ = bdnode_test.o bdnode_multitest1.o bdnode_test2.o - -TESTS = bdmetric_test bdmsgs_test bdspace_test -TESTS += bdmgr_multitest bdquery_test bdstore_test -TESTS += bdmidids_test bdspace_test2 udpbitdht_nettest -TESTS += bdbloom_test -#TESTS += bencode_test bdudp_test -#Tests to Fix. -#TESTS = bdnode_test bdnode_multitest1 bdnode_test2 - -MANUAL_TESTS = - -all: tests $(MANUAL_TESTS) - -bdmsgs_test: bdmsgs_test.o - $(CC) $(CFLAGS) -o bdmsgs_test bdmsgs_test.o $(LIBS) - -bdmetric_test: bdmetric_test.o - $(CC) $(CFLAGS) -o bdmetric_test bdmetric_test.o $(LIBS) - -bdquery_test: bdquery_test.o - $(CC) $(CFLAGS) -o bdquery_test bdquery_test.o $(LIBS) - -bdspace_test: bdspace_test.o - $(CC) $(CFLAGS) -o bdspace_test bdspace_test.o $(LIBS) - -bdspace_test2: bdspace_test2.o - $(CC) $(CFLAGS) -o bdspace_test2 bdspace_test2.o $(LIBS) - -bdnode_test: bdnode_test.o - $(CC) $(CFLAGS) -o bdnode_test bdnode_test.o $(LIBS) - -bdnode_test2: bdnode_test2.o - $(CC) $(CFLAGS) -o bdnode_test2 bdnode_test2.o $(LIBS) - -bdmidids_test: bdmidids_test.o - $(CC) $(CFLAGS) -o bdmidids_test bdmidids_test.o $(LIBS) - - -bdnode_multitest1: bdnode_multitest1.o - $(CC) $(CFLAGS) -o bdnode_multitest1 bdnode_multitest1.o $(LIBS) - -bdmgr_multitest: bdmgr_multitest.o - $(CC) $(CFLAGS) -o bdmgr_multitest bdmgr_multitest.o $(LIBS) - - -bdstore_test: bdstore_test.o - $(CC) $(CFLAGS) -o bdstore_test bdstore_test.o $(LIBS) - -bdudp_test: bdudp_test.o - $(CC) $(CFLAGS) -o bdudp_test bdudp_test.o $(LIBS) - -udpbitdht_nettest: udpbitdht_nettest.o - $(CC) $(CFLAGS) -o udpbitdht_nettest udpbitdht_nettest.o $(LIBS) - -bencode_test: bencode_test.o - $(CC) $(CFLAGS) -o bencode_test bencode_test.o $(LIBS) - -bdbloom_test: bdbloom_test.o - $(CC) $(CFLAGS) -o bdbloom_test bdbloom_test.o $(LIBS) - -bdbloom_makefilter: bdbloom_makefilter.o - $(CC) $(CFLAGS) -o bdbloom_makefilter bdbloom_makefilter.o $(LIBS) - - -clobber: remove_extra_files - -remove_extra_files: - -$(RM) $(MANUAL_TESTS) - -############################################################### -include $(TEST_TOP_DIR)/scripts/rules.mk -############################################################### - diff --git a/libresapi/src/webui/Makefile b/libresapi/src/webui/Makefile deleted file mode 100644 index cd96f11ce..000000000 --- a/libresapi/src/webui/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -REACT_VERSION = 0.13.1 - -DISTDIR = ../webfiles -JSEXTLIBS = $(DISTDIR)/react.js $(DISTDIR)/JSXTransformer.js -JSLIBS = RsXHRConnection.js RsApi.js -HTML = index.html -JSGUI = gui.jsx -CSS = green-black.css - -all: $(DISTDIR) $(JSEXTLIBS) $(addprefix $(DISTDIR)/, $(JSLIBS)) $(addprefix $(DISTDIR)/, $(HTML)) $(addprefix $(DISTDIR)/, $(JSGUI)) $(addprefix $(DISTDIR)/, $(CSS)) -.PHONY: all - -$(DISTDIR)/livereload: $(DISTDIR) $(JSEXTLIBS) $(addprefix $(DISTDIR)/, $(JSLIBS)) $(addprefix $(DISTDIR)/, $(HTML)) $(addprefix $(DISTDIR)/, $(JSGUI)) $(addprefix $(DISTDIR)/, $(CSS)) - wget -qO- http://localhost:9090/api/v2/livereload/trigger - touch $(DISTDIR)/livereload - -$(DISTDIR)/react.js: - cd $(DISTDIR) && wget --no-check-certificate --output-document react.js http://fb.me/react-$(REACT_VERSION).js - -$(DISTDIR)/JSXTransformer.js: - cd $(DISTDIR) && wget --no-check-certificate --output-document JSXTransformer.js http://fb.me/JSXTransformer-$(REACT_VERSION).js - -$(addprefix $(DISTDIR)/, $(JSLIBS)): $(DISTDIR)/%: % - cp $< $@ - -$(addprefix $(DISTDIR)/, $(HTML)): $(DISTDIR)/%: % - cp $< $@ - -$(addprefix $(DISTDIR)/, $(JSGUI)): $(DISTDIR)/%: % - cp $< $@ - -$(addprefix $(DISTDIR)/, $(CSS)): $(DISTDIR)/%: % - cp $< $@ - -$(DISTDIR): - mkdir $(DISTDIR) diff --git a/libretroshare/src/pqi/Makefile b/libretroshare/src/pqi/Makefile deleted file mode 100644 index dc41bfa16..000000000 --- a/libretroshare/src/pqi/Makefile +++ /dev/null @@ -1,77 +0,0 @@ - -RS_TOP_DIR = .. -##### Define any flags that are needed for this section ####### -############################################################### - -############################################################### -include $(RS_TOP_DIR)/scripts/config.mk -############################################################### - -BASE_OBJ = pqisecurity.o pqinetwork.o -#pqi_base.o - -LOOP_OBJ = pqiloopback.o -STREAM_OBJ = pqistreamer.o pqiarchive.o pqistore.o pqibin.o -MGR_OBJ = pqimonitor.o p3dhtmgr.o p3connmgr.o p3cfgmgr.o p3authmgr.o -GRP_OBJ = pqiperson.o pqihandler.o pqiservice.o pqipersongrp.o -SSL_OBJ = pqissl.o pqissllistener.o pqisslpersongrp.o cleanupxpgp.o -UDP_OBJ = pqissludp.o - -OTHER_OBJ = p3notify.o - - -TESTOBJ = net_test.o dht_test.o net_test1.o netiface_test.o -#conn_test.o - -TESTS = net_test dht_test net_test1 netiface_test -#conn_test - -ifdef PQI_USE_XPGP - SSL_OBJ += authxpgp.o - TESTOBJ += xpgp_id.o - TESTS += xpgp_id -else - ifdef PQI_USE_SSLONLY - SSL_OBJ += authssl.o - else - SSL_OBJ += authssl.o authgpg.o - TESTOBJ += gpgme_tst.o - TESTS += gpgme_tst - endif -endif - -RSOBJ = $(BASE_OBJ) $(LOOP_OBJ) \ - $(STREAM_OBJ) \ - $(MGR_OBJ) \ - $(SSL_OBJ) \ - $(UDP_OBJ) \ - $(GRP_OBJ) \ - $(OTHER_OBJ) - -all: librs tests - -gpgme_tst: gpgme_tst.o - $(CC) $(CFLAGS) -o gpgme_tst gpgme_tst.o $(LIBS) - -xpgp_id: xpgp_id.o - $(CC) $(CFLAGS) -o xpgp_id xpgp_id.o $(LIBS) - -dht_test: dht_test.o - $(CC) $(CFLAGS) -o dht_test dht_test.o $(LIBS) - -conn_test: conn_test.o - $(CC) $(CFLAGS) -o conn_test conn_test.o $(LIBS) - -net_test: net_test.o - $(CC) $(CFLAGS) -o net_test net_test.o $(LIBS) - -net_test1: net_test1.o - $(CC) $(CFLAGS) -o net_test1 net_test1.o $(LIBS) - -netiface_test: netiface_test.o - $(CC) $(CFLAGS) -o netiface_test netiface_test.o $(LIBS) - -############################################################### -include $(RS_TOP_DIR)/scripts/rules.mk -############################################################### - diff --git a/libretroshare/src/retroshare/Makefile b/libretroshare/src/retroshare/Makefile deleted file mode 100644 index 0b4646b09..000000000 --- a/libretroshare/src/retroshare/Makefile +++ /dev/null @@ -1,25 +0,0 @@ - -RS_TOP_DIR = .. -##### Define any flags that are needed for this section ####### -############################################################### - -############################################################### -include $(RS_TOP_DIR)/scripts/config.mk -############################################################### - -OBJ = notifytxt.o retroshare.o - -#TESTOBJ = - -TESTS = retroshare-nogui - -all: tests - -retroshare-nogui: $(OBJ) - $(CC) $(CFLAGS) -o retroshare-nogui $(OBJ) $(LIBS) - - -############################################################### -include $(RS_TOP_DIR)/scripts/rules.mk -############################################################### - diff --git a/libretroshare/src/rsserver/Makefile b/libretroshare/src/rsserver/Makefile deleted file mode 100644 index fae412965..000000000 --- a/libretroshare/src/rsserver/Makefile +++ /dev/null @@ -1,35 +0,0 @@ - -RS_TOP_DIR = .. -##### Define any flags that are needed for this section ####### -############################################################### - -############################################################### -include $(RS_TOP_DIR)/scripts/config.mk -############################################################### - -RSOBJ = rsinit.o \ - p3peers.o \ - p3rank.o \ - p3photo.o \ - p3msgs.o \ - p3blog.o \ - p3discovery.o \ - p3face-server.o \ - p3face-config.o \ - p3face-msgs.o \ - rsiface.o \ - rstypes.o - -#TESTOBJ = - -#TESTS = - -all: librs tests - -#tlvbase_test : tlvbase_test.o -# $(CC) $(CFLAGS) -o tlvbase_test tlvbase_test.o $(OBJ) $(LIBS) - -############################################################### -include $(RS_TOP_DIR)/scripts/rules.mk -############################################################### - diff --git a/libretroshare/src/services/Makefile b/libretroshare/src/services/Makefile deleted file mode 100644 index c85837f32..000000000 --- a/libretroshare/src/services/Makefile +++ /dev/null @@ -1,36 +0,0 @@ - -RS_TOP_DIR = .. -##### Define any flags that are needed for this section ####### -############################################################### - -############################################################### -include $(RS_TOP_DIR)/scripts/config.mk -############################################################### - -RSOBJ = p3service.o p3chatservice.o p3msgservice.o \ - p3gamelauncher.o p3ranking.o p3disc.o \ - p3photoservice.o \ - p3distrib.o \ - p3status.o \ - p3Qblog.o \ - p3forums.o \ - p3channels.o \ - p3portservice.o - -# dummy forums interface. -# p3forums-dummy.o \ - -TESTOBJ = forum_test.o - -TESTS = forum_test - -all: librs tests - -forum_test : forum_test.o - $(CC) $(CFLAGS) -o forum_test forum_test.o $(OBJ) $(LIBS) - - -############################################################### -include $(RS_TOP_DIR)/scripts/rules.mk -############################################################### - diff --git a/libretroshare/src/tests/dbase/Makefile b/libretroshare/src/tests/dbase/Makefile deleted file mode 100644 index 5e881dff6..000000000 --- a/libretroshare/src/tests/dbase/Makefile +++ /dev/null @@ -1,55 +0,0 @@ - -RS_TOP_DIR = ../.. -DHT_TOP_DIR = ../../../../libbitdht/src -OPS_TOP_DIR = ../../../../openpgpsdk/src -##### Define any flags that are needed for this section ####### -############################################################### - -############################################################### -include $(RS_TOP_DIR)/tests/scripts/config.mk -############################################################### - -TESTOBJ = fitest2.o fisavetest.o searchtest.o #ficachetest.o -#ficachetest.o - -TESTS = fitest2 fisavetest searchtest #ficachetest -#ficachetest - -ifeq ($(OS),Linux) - TESTOBJ += fimontest.o - TESTS += fimontest -endif - - -ifeq ($(OS),MacOSX) - TESTOBJ += fimontest.o - TESTS += fimontest -endif - - -all: tests - -fitest2 : fitest2.o $(OBJ) - $(CC) $(CFLAGS) -o fitest2 fitest2.o $(OBJ) $(LIBS) - -fisavetest : fisavetest.o $(OBJ) - $(CC) $(CFLAGS) -o fisavetest fisavetest.o $(OBJ) $(LIBS) - -fimontest : fimontest.o $(OBJ) - $(CC) $(CFLAGS) -o fimontest fimontest.o $(OBJ) $(LIBS) - -ficachetest : ficachetest.o $(OBJ) - $(CC) $(CFLAGS) -o ficachetest ficachetest.o $(OBJ) $(LIBS) - -searchtest : searchtest.o $(OBJ) - $(CC) $(CFLAGS) -o searchtest searchtest.o $(OBJ) $(LIBS) - -clobber: rmtestfiles - -rmtestfiles: - $(RM) test.index - -############################################################### -include $(RS_TOP_DIR)/tests/scripts/rules.mk -############################################################### - diff --git a/libretroshare/src/tests/ft/Makefile b/libretroshare/src/tests/ft/Makefile deleted file mode 100644 index 4951fcbfa..000000000 --- a/libretroshare/src/tests/ft/Makefile +++ /dev/null @@ -1,60 +0,0 @@ - -RS_TOP_DIR = ../.. -DHT_TOP_DIR = ../../../../libbitdht/src -OPS_TOP_DIR = ../../../../openpgpsdk/src - -##### Define any flags that are needed for this section ####### -############################################################### - -############################################################### -include $(RS_TOP_DIR)/tests/scripts/config.mk -############################################################### - -TESTOBJ = pqitestor.o ftfilemappertest.o ftfileprovidertest.o ftfilecreatortest.o ftextralisttest.o ftdataplextest.o fttransfermoduletest.o ftcrc32test.o ftcrossprovidercreatortest.o ftcontrollertest.o ftserver1test.o ftserver2test.o ftserver3test.o ftdata_dummy.o ftsearch_dummy.o - -TESTS = ftfileprovidertest ftfilecreatortest ftextralisttest ftdataplextest fttransfermoduletest ftcrc32test ftcrossprovidercreatortest ftcontrollertest ftserver1test ftserver2test fttransfermoduletest ftserver3test -#ftfilemappertest - -all: tests - -ftfilemappertest : ftfilemappertest.o - $(CC) $(CFLAGS) -o ftfilemappertest ftfilemappertest.o $(LIBS) - -ftcontrollertest : ftcontrollertest.o pqitestor.o - $(CC) $(CFLAGS) -o ftcontrollertest ftcontrollertest.o pqitestor.o $(LIBS) - -ftfilecreatortest : ftfilecreatortest.o - $(CC) $(CFLAGS) -o ftfilecreatortest ftfilecreatortest.o $(LIBS) - -ftcrossprovidercreatortest : ftcrossprovidercreatortest.o - $(CC) $(CFLAGS) -o ftcrossprovidercreatortest ftcrossprovidercreatortest.o $(LIBS) - -ftfileprovidertest : ftfileprovidertest.o - $(CC) $(CFLAGS) -o ftfileprovidertest ftfileprovidertest.o $(LIBS) - -fttransfermoduletest : fttransfermoduletest.o - $(CC) $(CFLAGS) -o fttransfermoduletest ftdata_dummy.o ftsearch_dummy.o fttransfermoduletest.o $(LIBS) - -ftextralisttest : ftextralisttest.o - $(CC) $(CFLAGS) -o ftextralisttest ftextralisttest.o $(LIBS) - -ftdataplextest : ftdataplextest.o ftsearch_dummy.o ftdata_dummy.o - $(CC) $(CFLAGS) -o ftdataplextest ftdata_dummy.o ftdataplextest.o ftsearch_dummy.o $(LIBS) - -ftserver1test : ftserver1test.o pqitestor.o - $(CC) $(CFLAGS) -o ftserver1test ftserver1test.o pqitestor.o $(LIBS) - -ftserver2test : ftserver2test.o pqitestor.o - $(CC) $(CFLAGS) -o ftserver2test ftserver2test.o pqitestor.o $(LIBS) - -ftserver3test : ftserver3test.o pqitestor.o - $(CC) $(CFLAGS) -o ftserver3test ftserver3test.o pqitestor.o $(LIBS) - -ftcrc32test : ftcrc32test.o - $(CC) $(CFLAGS) -O0 -g -o ftcrc32test ftcrc32test.o $(LIBS) - -############################################################### -include $(RS_TOP_DIR)/tests/scripts/rules.mk -############################################################### - - diff --git a/libretroshare/src/tests/general/Makefile b/libretroshare/src/tests/general/Makefile deleted file mode 100644 index c21a36ceb..000000000 --- a/libretroshare/src/tests/general/Makefile +++ /dev/null @@ -1,32 +0,0 @@ - -RS_TOP_DIR = ../.. -DHT_TOP_DIR = ../../../../libbitdht/src -OPS_TOP_DIR = ../../../../openpgpsdk/src -##### Define any flags that are needed for this section ####### -############################################################### - -############################################################### -include $(RS_TOP_DIR)/tests/scripts/config.mk -############################################################### - -TESTOBJ = netsetup_test.o random_test.o memory_management_test.o pgpkey_test.o -TESTS = netsetup_test random_test memory_management_test pgpkey_test - -all: tests - -pgpkey_test: pgpkey_test.o - $(CC) $(CFLAGS) -o pgpkey_test pgpkey_test.o $(LIBS) - -netsetup_test: netsetup_test.o - $(CC) $(CFLAGS) -o netsetup_test netsetup_test.o $(LIBS) - -random_test: random_test.o - $(CC) $(CFLAGS) -o random_test random_test.o $(LIBS) - -memory_management_test: memory_management_test.o - $(CC) $(CFLAGS) -o memory_management_test memory_management_test.o $(LIBS) - -############################################################### -include $(RS_TOP_DIR)/tests/scripts/rules.mk -############################################################### - diff --git a/libretroshare/src/tests/pgp/Makefile b/libretroshare/src/tests/pgp/Makefile deleted file mode 100644 index 0032a14fb..000000000 --- a/libretroshare/src/tests/pgp/Makefile +++ /dev/null @@ -1,39 +0,0 @@ - -RS_TOP_DIR = ../.. -DHT_TOP_DIR = ../../../../libbitdht/src -OPS_TOP_DIR = ../../../../openpgpsdk/src -OPENPGP_INCLUDE_DIR = ../../../../openpgpsdk/src - -##### Define any flags that are needed for this section ####### -############################################################### - -############################################################### -include $(RS_TOP_DIR)/tests/scripts/config.mk -############################################################### - -TESTOBJ = test_pgp_handler.o test_pgp_signature_parsing.o test_key_parsing.o test_certificate.o test_identity_import.o -TESTS = test_pgp_handler test_pgp_signature_parsing test_key_parsing test_certificate test_identity_import - -#rsbaseitem_test - -all: tests - -test_certificate : test_certificate.o - $(CC) $(CFLAGS) -o test_certificate test_certificate.o $(OBJ) $(LIBS) -L../../../../openpgpsdk/src/lib/ -lops -lbz2 - -test_identity_import : test_identity_import.o - $(CC) $(CFLAGS) -o test_identity_import test_identity_import.o $(OBJ) $(LIBS) -L../../../../openpgpsdk/src/lib/ -lops -lbz2 - -test_pgp_handler : test_pgp_handler.o - $(CC) $(CFLAGS) -o test_pgp_handler test_pgp_handler.o $(OBJ) $(LIBS) -L../../../../openpgpsdk/src/lib/ -lops -lbz2 - -test_pgp_signature_parsing : test_pgp_signature_parsing.o - $(CC) $(CFLAGS) -o test_pgp_signature_parsing test_pgp_signature_parsing.o $(OBJ) $(LIBS) -L../../../../openpgpsdk/src/lib/ -lops -lbz2 - -test_key_parsing : test_key_parsing.o - $(CC) $(CFLAGS) -o test_key_parsing test_key_parsing.o ../../../../openpgpsdk/src/lib/libops.a -lssl -lcrypto -lbz2 - -############################################################### -include $(RS_TOP_DIR)/scripts/rules.mk -############################################################### - diff --git a/libretroshare/src/tests/pqi/Makefile b/libretroshare/src/tests/pqi/Makefile deleted file mode 100644 index 533a07f2b..000000000 --- a/libretroshare/src/tests/pqi/Makefile +++ /dev/null @@ -1,93 +0,0 @@ - -RS_TOP_DIR = ../.. -DHT_TOP_DIR = ../../../../libbitdht/src/ -OPS_TOP_DIR = ../../../../openpgpsdk/src/ - -##### Define any flags that are needed for this section ####### -############################################################### - -############################################################### -include $(RS_TOP_DIR)/tests/scripts/config.mk -############################################################### - -# Generic Test Harnesses. -TESTOBJ = conn_harness.o ppg_harness.o - -TESTOBJ += pqiqos_test.o -TESTOBJ += net_test.o dht_test.o net_test1.o netiface_test.o dht_test.o -TESTOBJ += pkt_test.o pqiarchive_test.o pqiperson_test.o -TESTOBJ += extaddrfinder_test.o dnsresolver_test.o pqiipset_test.o -TESTOBJ += p3connmgr_reset_test.o p3connmgr_connect_test.o -#conn_test.o - -TESTS = net_test net_test1 netiface_test pqiarchive_test pqiperson_test dnsresolver_test extaddrfinder_test -TESTS += pqiipset_test -TESTS += pqiqos_test -TESTS += p3connmgr_reset_test p3connmgr_connect_test -#TESTS = p3connmgr_test1 - -MANUAL_TESTS = dht_test -#conn_test - -all: tests $(MANUAL_TESTS) - -gpgme_tst: gpgme_tst.o - $(CC) $(CFLAGS) -o gpgme_tst gpgme_tst.o $(LIBS) - -xpgp_id: xpgp_id.o - $(CC) $(CFLAGS) -o xpgp_id xpgp_id.o $(LIBS) - -dht_test: dht_test.o - $(CC) $(CFLAGS) -o dht_test dht_test.o $(LIBS) - -conn_test: conn_test.o - $(CC) $(CFLAGS) -o conn_test conn_test.o $(LIBS) - -net_test: net_test.o - $(CC) $(CFLAGS) -o net_test net_test.o $(LIBS) - -net_test1: net_test1.o - $(CC) $(CFLAGS) -o net_test1 net_test1.o $(LIBS) - -netiface_test: netiface_test.o - $(CC) $(CFLAGS) -o netiface_test netiface_test.o $(LIBS) - -pqiarchive_test: pqiarchive_test.o pkt_test.o - $(CC) $(CFLAGS) -o pqiarchive_test pkt_test.o pqiarchive_test.o $(LIBS) - -pqiperson_test: pqiperson_test.o testconnect.o - $(CC) $(CFLAGS) -o pqiperson_test pqiperson_test.o testconnect.o $(LIBS) -lstdc++ - -extaddrfinder_test: extaddrfinder_test.o - $(CC) $(CFLAGS) -DEXTADDRSEARCH_DEBUG=1 -o extaddrfinder_test extaddrfinder_test.o $(LIBS) - -pqiqos_test: pqiqos_test.o - $(CC) $(CFLAGS) -o pqiqos_test pqiqos_test.o $(LIBS) - -dnsresolver_test: dnsresolver_test.o - $(CC) $(CFLAGS) -o dnsresolver_test dnsresolver_test.o $(LIBS) - -pqiipset_test: pqiipset_test.o - $(CC) $(CFLAGS) -o pqiipset_test pqiipset_test.o $(LIBS) - -p3connmgr_reset_test: p3connmgr_reset_test.o - $(CC) $(CFLAGS) -o p3connmgr_reset_test p3connmgr_reset_test.o $(LIBS) - -p3connmgr_connect_test: p3connmgr_connect_test.o conn_harness.o ppg_harness.o - $(CC) $(CFLAGS) -o p3connmgr_connect_test p3connmgr_connect_test.o conn_harness.o ppg_harness.o $(LIBS) - - -p3connmgr_test1: p3connmgr_test1.o - $(CC) $(CFLAGS) -o p3connmgr_test1 p3connmgr_test1.o $(LIBS) - - - -clobber: remove_extra_files - -remove_extra_files: - -$(RM) $(MANUAL_TESTS) - -############################################################### -include $(RS_TOP_DIR)/tests/scripts/rules.mk -############################################################### - diff --git a/libretroshare/src/tests/serialiser/Makefile b/libretroshare/src/tests/serialiser/Makefile deleted file mode 100644 index 287e59058..000000000 --- a/libretroshare/src/tests/serialiser/Makefile +++ /dev/null @@ -1,92 +0,0 @@ - -RS_TOP_DIR = ../.. -DHT_TOP_DIR = ../../../../libbitdht/src -OPS_TOP_DIR = ../../../../openpgpsdk/src - -##### Define any flags that are needed for this section ####### -############################################################### - -############################################################### -include $(RS_TOP_DIR)/tests/scripts/config.mk -############################################################### - -OBJ = rstlvutil.o - -TESTOBJ = tlvbase_test.o tlvbase_test2.o rstunnelitem_test.o -TESTOBJ += tlvitems_test.o tlvstack_test.o rsserial_test.o -TESTOBJ += rstlvwidetest.o tlvrandom_test.o rsturtleitem_test.o -TESTOBJ += tlvtypes_test.o support.o distribitem_test.o rsmsgitem_test.o -TESTOBJ += rsstatusitem_test.o rsconfigitem_test.o -TESTOBJ += rsgrouteritem_test.o $(OBJ) - -TESTS = tlvbase_test tlvbase_test2 -#rstlvwidetest -TESTS += tlvitems_test tlvstack_test -#rstunnelitem_test -TESTS += tlvrandom_test rsturtleitem_test -#rsserial_test -TESTS += tlvtypes_test -#rsmsgitem_test -#distribitem_test -TESTS += rsstatusitem_test -#rsconfigitem_test -#TESTS += rsgrouteritem_test - -#rsbaseitem_test - -all: tests - -tests: $(OBJ) - -tlvbase_test : tlvbase_test.o - $(CC) $(CFLAGS) -o tlvbase_test tlvbase_test.o $(OBJ) $(LIBS) - -tlvbase_test2 : tlvbase_test2.o - $(CC) $(CFLAGS) -o tlvbase_test2 tlvbase_test2.o $(OBJ) $(LIBS) - -tlvitems_test : tlvitems_test.o - $(CC) $(CFLAGS) -o tlvitems_test tlvitems_test.o $(OBJ) $(LIBS) - -tlvstack_test : tlvstack_test.o - $(CC) $(CFLAGS) -o tlvstack_test tlvstack_test.o $(OBJ) $(LIBS) - -rsserial_test : rsserial_test.o - $(CC) $(CFLAGS) -o rsserial_test rsserial_test.o $(OBJ) $(LIBS) - -rsgrouteritem_test : rsgrouteritem_test.o - $(CC) $(CFLAGS) -o rsgrouteritem_test rsgrouteritem_test.o $(OBJ) $(LIBS) - -rsbaseitem_test : rsbaseitem_test.o - $(CC) $(CFLAGS) -o rsbaseitem_test rsbaseitem_test.o $(OBJ) $(LIBS) - -#rstlvwidetest : rstlvwidetest.o -# $(CC) $(CFLAGS) -o rstlvwidetest rstlvwidetest.o $(OBJ) $(LIBS) - -tlvrandom_test : tlvrandom_test.o - $(CC) $(CFLAGS) -o tlvrandom_test tlvrandom_test.o $(OBJ) $(LIBS) - -rsturtleitem_test : rsturtleitem_test.o support.o - $(CC) $(CFLAGS) -o rsturtleitem_test rsturtleitem_test.o support.o $(OBJ) $(LIBS) - -rstunnelitem_test : rstunnelitem_test.o support.o - $(CC) $(CFLAGS) -o rstunnelitem_test rstunnelitem_test.o support.o $(OBJ) $(LIBS) - -tlvtypes_test : tlvtypes_test.o - $(CC) $(CFLAGS) -o tlvtypes_test tlvtypes_test.o $(OBJ) $(LIBS) - -distribitem_test : distribitem_test.o support.o - $(CC) $(CFLAGS) -o distribitem_test distribitem_test.o support.o $(OBJ) $(LIBS) - -rsmsgitem_test : rsmsgitem_test.o support.o - $(CC) $(CFLAGS) -o rsmsgitem_test rsmsgitem_test.o support.o $(OBJ) $(LIBS) - -rsstatusitem_test : rsstatusitem_test.o support.o - $(CC) $(CFLAGS) -o rsstatusitem_test rsstatusitem_test.o support.o $(OBJ) $(LIBS) - -rsconfigitem_test : rsconfigitem_test.o - $(CC) $(CFLAGS) -o rsconfigitem_test rsconfigitem_test.o support.o $(OBJ) $(LIBS) - -############################################################### -include $(RS_TOP_DIR)/scripts/rules.mk -############################################################### - diff --git a/libretroshare/src/tests/services/Makefile b/libretroshare/src/tests/services/Makefile deleted file mode 100644 index a57378ba4..000000000 --- a/libretroshare/src/tests/services/Makefile +++ /dev/null @@ -1,33 +0,0 @@ - -RS_TOP_DIR = ../.. -DHT_TOP_DIR = ../../../../libbitdht/src -OPS_TOP_DIR = ../../../../openpgpsdk/src - -##### Define any flags that are needed for this section ####### -############################################################### - -############################################################### -include $(RS_TOP_DIR)/tests/scripts/config.mk -############################################################### - - -TESTOBJ = servicetest.o forumservicetest.o chatservicetest.o -TESTOBJ += chattest.o distribtest.o - -TESTS = chattest distribtest - -all: tests - -distribtest: distribtest.o servicetest.o forumservicetest.o - $(CC) $(CFLAGS) -o distribtest distribtest.o servicetest.o \ - forumservicetest.o $(OBJ) $(LIBS) - -chattest: chattest.o servicetest.o chatservicetest.o - $(CC) $(CFLAGS) -o chattest chattest.o servicetest.o \ - chatservicetest.o $(OBJ) $(LIBS) - - -############################################################### -include $(RS_TOP_DIR)/scripts/rules.mk -############################################################### - diff --git a/libretroshare/src/tests/tcponudp/Makefile b/libretroshare/src/tests/tcponudp/Makefile deleted file mode 100644 index aa8835e9b..000000000 --- a/libretroshare/src/tests/tcponudp/Makefile +++ /dev/null @@ -1,83 +0,0 @@ - -RS_TOP_DIR = ../.. -DHT_TOP_DIR = ../../../../libbitdht/src -OPS_TOP_DIR = ../../../../openpgpsdk/src -##### Define any flags that are needed for this section ####### -############################################################### - -############################################################### -include $(RS_TOP_DIR)/tests/scripts/config.mk -############################################################### - -#BIOOBJ = bss_tou.o - -#RSOBJ = tou_net.o udplayer.o udpsorter.o udptestfn.o extaddrfinder.o -#RSOBJ += tcppacket.o tcpstream.o tou.o $(BIOOBJ) - -OBJ = udptestfn.o - -EXECS = udpsock_test udpsort_test udp_server test_tou -EXECS += pair_tou stacks_tou bidir_tou timed_tou -#pair_tou reset_tou internal_tou largefile_tou - -TESTOBJ = udpsock_test.o udpsort_test.o udp_server.o test_tou.o -TESTOBJ += pair_tou.o udptestfn.o -TESTOBJ += stacks_tou.o bidir_tou.o timed_tou.o - -#TESTOBJ += pair_tou.o reset_tou.o largefile_tou.o -#internal_tou.o - -TESTS = udpsock_test udpsort_test udp_server test_tou -TESTS += stacks_tou bidir_tou timed_tou -#TESTS += pair_tou -# Unfortunately the design of tou has changed over time. -# and these tests cannot be performed at the moment. -#TESTS += reset_tou largefile_tou -#internal_tou - -all: tests $(EXECS) - -udpsock_test : $(OBJ) udpsock_test.o - $(CC) $(CFLAGS) -o udpsock_test udpsock_test.o $(OBJ) $(LIBS) - -udpsort_test : $(OBJ) udpsort_test.o - $(CC) $(CFLAGS) -o udpsort_test udpsort_test.o $(OBJ) $(LIBS) - -udp_server: $(OBJ) udp_server.o - $(CC) $(CFLAGS) -o udp_server udp_server.o $(OBJ) $(LIBS) - -test_tou : $(OBJ) test_tou.o - $(CC) $(CFLAGS) -o test_tou test_tou.o $(OBJ) $(LIBS) - -pair_tou : $(OBJ) pair_tou.o - $(CC) $(CFLAGS) -o pair_tou pair_tou.o $(OBJ) $(LIBS) - -stacks_tou : $(OBJ) stacks_tou.o - $(CC) $(CFLAGS) -o stacks_tou stacks_tou.o $(OBJ) $(LIBS) - -bidir_tou : $(OBJ) bidir_tou.o - $(CC) $(CFLAGS) -o bidir_tou bidir_tou.o $(OBJ) $(LIBS) - -timed_tou : $(OBJ) timed_tou.o - $(CC) $(CFLAGS) -o timed_tou timed_tou.o $(OBJ) $(LIBS) - -reset_tou : $(OBJ) reset_tou.o - $(CC) $(CFLAGS) -o reset_tou reset_tou.o $(OBJ) $(LIBS) - -internal_tou : $(OBJ) internal_tou.o - $(CC) $(CFLAGS) -o internal_tou internal_tou.o $(OBJ) $(LIBS) - -largefile_tou : $(OBJ) largefile_tou.o - $(CC) $(CFLAGS) -o largefile_tou largefile_tou.o $(OBJ) $(LIBS) - - -# Extra Rule for BIOFLAGS -.c.o: - $(BIOCC) $(BIOCFLAGS) -c $< - -############################################################### -include $(RS_TOP_DIR)/tests/scripts/rules.mk -############################################################### - -CFLAGS += -DRS_USE_BITDHT -I$(DHT_TOP_DIR) - diff --git a/libretroshare/src/tests/upnp/Makefile b/libretroshare/src/tests/upnp/Makefile deleted file mode 100644 index 1c1d8626f..000000000 --- a/libretroshare/src/tests/upnp/Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -RS_TOP_DIR = ../.. -DHT_TOP_DIR = ../../../../libbitdht/src -OPS_TOP_DIR = ../../../../openpgpsdk/src -##### Define any flags that are needed for this section ####### -############################################################### - -############################################################### -include $(RS_TOP_DIR)/tests/scripts/config.mk -############################################################### - -TESTOBJ = -TESTS = - -all: upnpforward - -upnpforward: upnpforward.o - $(CC) $(CFLAGS) -o upnpforward upnpforward.o $(LIBS) - -############################################################### -include $(RS_TOP_DIR)/tests/scripts/rules.mk -############################################################### - diff --git a/libretroshare/src/tests/util/Makefile b/libretroshare/src/tests/util/Makefile deleted file mode 100644 index 8ec44d149..000000000 --- a/libretroshare/src/tests/util/Makefile +++ /dev/null @@ -1,31 +0,0 @@ - -RS_TOP_DIR = ../.. -DHT_TOP_DIR = ../../../../libbitdht/src -OPS_TOP_DIR = ../../../../openpgpsdk/src -##### Define any flags that are needed for this section ####### -############################################################### - -############################################################### -include $(RS_TOP_DIR)/tests/scripts/config.mk -############################################################### - -TESTOBJ = dirtest.o compress_test.o sha1_test.o aes_test.o dchat_decrypt.o -TESTS = dirtest sha1_test aes_test compress_test dchat_decrypt - -all: tests - -sha1_test: sha1_test.o - $(CC) $(CFLAGS) -o sha1_test sha1_test.o $(LIBS) -compress_test: compress_test.o - $(CC) $(CFLAGS) -o compress_test compress_test.o $(LIBS) -dirtest: dirtest.o - $(CC) $(CFLAGS) -o dirtest dirtest.o $(LIBS) -dirtest: aes_test.o - $(CC) $(CFLAGS) -o aes_test aes_test.o $(LIBS) -dchat_decrypt: dchat_decrypt.o - $(CC) $(CFLAGS) -o dchat_decrypt dchat_decrypt.o $(LIBS) - -############################################################### -include $(RS_TOP_DIR)/tests/scripts/rules.mk -############################################################### - diff --git a/libretroshare/src/turtle/Makefile b/libretroshare/src/turtle/Makefile deleted file mode 100644 index 745a340ac..000000000 --- a/libretroshare/src/turtle/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -RS_TOP_DIR = .. -##### Define any flags that are needed for this section ####### -############################################################### - -############################################################### -include $(RS_TOP_DIR)/scripts/config.mk -############################################################### - -RSOBJ = p3turtle.o rsturtleitem.o - -#TESTOBJ = - -#TESTS = - -all: librs tests - -#tlvbase_test : tlvbase_test.o -# $(CC) $(CFLAGS) -o tlvbase_test tlvbase_test.o $(OBJ) $(LIBS) - -############################################################### -include $(RS_TOP_DIR)/scripts/rules.mk -############################################################### - diff --git a/libretroshare/src/upnp/Makefile b/libretroshare/src/upnp/Makefile deleted file mode 100644 index d579a2273..000000000 --- a/libretroshare/src/upnp/Makefile +++ /dev/null @@ -1,28 +0,0 @@ - -RS_TOP_DIR = .. -##### Define any flags that are needed for this section ####### -############################################################### - -EXTRA_CFLAGS += -I$(UPNPC_DIR) -DMINIUPNP_EXPORTS - -############################################################### -include $(RS_TOP_DIR)/scripts/config.mk -############################################################### - -CFLAGS += $(EXTRA_CFLAGS) - -RSOBJ = upnphandler.o upnputil.o - -TESTOBJ = upnptest.o - -TESTS = upnptest - -all: librs tests - -upnptest: $(OBJ) upnptest.o - $(CC) $(CFLAGS) -o upnptest $(OBJ) upnptest.o $(LIBS) - -############################################################### -include $(RS_TOP_DIR)/scripts/rules.mk -############################################################### - diff --git a/libretroshare/src/util/Makefile b/libretroshare/src/util/Makefile deleted file mode 100644 index 70f15b3be..000000000 --- a/libretroshare/src/util/Makefile +++ /dev/null @@ -1,27 +0,0 @@ - -RS_TOP_DIR = .. -##### Define any flags that are needed for this section ####### -############################################################### - -############################################################### -include $(RS_TOP_DIR)/scripts/config.mk -############################################################### - -RSOBJ = rsthreads.o rsprint.o rsnet.o rsdebug.o rsdir.o rsversion.o - -TESTOBJ = dirtest.o dir2test.o - -TESTS = dirtest dir2test - -all: librs tests - -dirtest: $(OBJ) dirtest.o - $(CC) $(CFLAGS) -o dirtest dirtest.o $(OBJ) $(LIBS) - -dir2test: $(OBJ) dir2test.o - $(CC) $(CFLAGS) -o dir2test dir2test.o $(OBJ) $(LIBS) - -############################################################### -include $(RS_TOP_DIR)/scripts/rules.mk -############################################################### - diff --git a/rsctrl/src/Makefile b/rsctrl/src/Makefile deleted file mode 100644 index a4c556640..000000000 --- a/rsctrl/src/Makefile +++ /dev/null @@ -1,33 +0,0 @@ - -EXEC = protoc -#PROTO = core.proto peers.proto system.proto chat.proto search.proto files.proto stream.proto gxs.proto msgs.proto -PROTO = core.proto peers.proto system.proto chat.proto search.proto files.proto stream.proto - -PROTOPATH = ./definition -#CDESTPATH = ./gencc -CDESTPATH = ../../retroshare-nogui/src/rpc/proto/gencc -PYDESTPATH = ./genpy -#PYDESTPATH = ../../../../github/pyrs/pyrs/proto - -CLIST = $(PROTO:%.proto=%.cc) -CCODE = $(patsubst %.proto,$(CDESTPATH)/%.pb.cc, $(PROTO)) -HCODE = $(patsubst %.proto,$(CDESTPATH)/%.pb.h, $(PROTO)) -PYCODE = $(patsubst %.proto,$(PYDESTPATH)/%_pb2.py, $(PROTO)) - - -all: allc python_proto - -allc: $(CCODE) - echo $(CCODE) - -python_proto: $(PYCODE) - echo $(PYCODE) - -$(CDESTPATH)/%.pb.cc : $(PROTOPATH)/%.proto - $(EXEC) --proto_path=$(PROTOPATH) --cpp_out=$(CDESTPATH) $< - -$(PYDESTPATH)/%_pb2.py : $(PROTOPATH)/%.proto - $(EXEC) --proto_path=$(PROTOPATH) --python_out=$(PYDESTPATH) $< - -clean: - -/bin/rm $(CCODE) $(HCODE) $(PYCODE) diff --git a/supportlibs/pegmarkdown/peg-0.1.9/Makefile b/supportlibs/pegmarkdown/peg-0.1.9/Makefile deleted file mode 100644 index c10fbda83..000000000 --- a/supportlibs/pegmarkdown/peg-0.1.9/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -CFLAGS = -g -Wall $(OFLAGS) $(XFLAGS) -OFLAGS = -O3 -DNDEBUG -#OFLAGS = -pg - -OBJS = tree.o compile.o - -all : peg leg - -peg : peg.o $(OBJS) - $(CC) $(CFLAGS) -o $@-new peg.o $(OBJS) - mv $@-new $@ - -leg : leg.o $(OBJS) - $(CC) $(CFLAGS) -o $@-new leg.o $(OBJS) - mv $@-new $@ - -ROOT = -PREFIX = /usr/local -BINDIR = $(ROOT)$(PREFIX)/bin - -install : $(BINDIR)/peg $(BINDIR)/leg - -$(BINDIR)/% : % - cp -p $< $@ - strip $@ - -uninstall : .FORCE - rm -f $(BINDIR)/peg - rm -f $(BINDIR)/leg - -peg.o : peg.c peg.peg-c - -%.peg-c : %.peg compile.c - ./peg -o $@ $< - -leg.o : leg.c - -leg.c : leg.leg compile.c - ./leg -o $@ $< - -check : check-peg check-leg - -check-peg : peg .FORCE - ./peg < peg.peg > peg.out - diff peg.peg-c peg.out - rm peg.out - -check-leg : leg .FORCE - ./leg < leg.leg > leg.out - diff leg.c leg.out - rm leg.out - -test examples : .FORCE - $(SHELL) -ec '(cd examples; $(MAKE))' - -clean : .FORCE - rm -f *~ *.o *.peg.[cd] *.leg.[cd] - $(SHELL) -ec '(cd examples; $(MAKE) $@)' - -spotless : clean .FORCE - rm -f peg - rm -f leg - $(SHELL) -ec '(cd examples; $(MAKE) $@)' - -.FORCE : diff --git a/supportlibs/pegmarkdown/peg-0.1.9/examples/Makefile b/supportlibs/pegmarkdown/peg-0.1.9/examples/Makefile deleted file mode 100644 index 30d3cc8f8..000000000 --- a/supportlibs/pegmarkdown/peg-0.1.9/examples/Makefile +++ /dev/null @@ -1,88 +0,0 @@ -EXAMPLES = test rule accept wc dc dcv calc basic localctx - -CFLAGS = -g -O3 - -DIFF = diff -TEE = cat > - -all : $(EXAMPLES) - -test : .FORCE - ../peg -o test.peg.c test.peg - $(CC) $(CFLAGS) -o test test.c - echo 'ab.ac.ad.ae.afg.afh.afg.afh.afi.afj.' | ./$@ | $(TEE) $@.out - $(DIFF) $@.ref $@.out - rm -f $@.out - @echo - -rule : .FORCE - ../peg -o rule.peg.c rule.peg - $(CC) $(CFLAGS) -o rule rule.c - echo 'abcbcdabcbcdabcbcdabcbcd' | ./$@ | $(TEE) $@.out - $(DIFF) $@.ref $@.out - rm -f $@.out - @echo - -accept : .FORCE - ../peg -o accept.peg.c accept.peg - $(CC) $(CFLAGS) -o accept accept.c - echo 'abcbcdabcbcdabcbcdabcbcd' | ./$@ | $(TEE) $@.out - $(DIFF) $@.ref $@.out - rm -f $@.out - @echo - -wc : .FORCE - ../leg -o wc.leg.c wc.leg - $(CC) $(CFLAGS) -o wc wc.leg.c - cat wc.leg | ./$@ | $(TEE) $@.out - $(DIFF) $@.ref $@.out - rm -f $@.out - @echo - -dc : .FORCE - ../peg -o dc.peg.c dc.peg - $(CC) $(CFLAGS) -o dc dc.c - echo ' 2 *3 *(3+ 4) ' | ./dc | $(TEE) $@.out - $(DIFF) $@.ref $@.out - rm -f $@.out - @echo - -dcv : .FORCE - ../peg -o dcv.peg.c dcv.peg - $(CC) $(CFLAGS) -o dcv dcv.c - echo 'a = 6; b = 7; a * b' | ./dcv | $(TEE) $@.out - $(DIFF) $@.ref $@.out - rm -f $@.out - @echo - -calc : .FORCE - ../leg -o calc.leg.c calc.leg - $(CC) $(CFLAGS) -o calc calc.leg.c - echo 'a = 6; b = 7; a * b' | ./calc | $(TEE) $@.out - $(DIFF) $@.ref $@.out - rm -f $@.out - @echo - -basic : .FORCE - ../leg -o basic.leg.c basic.leg - $(CC) $(CFLAGS) -o basic basic.leg.c - ( echo 'load "test"'; echo "run" ) | ./basic | $(TEE) $@.out - $(DIFF) $@.ref $@.out - rm -f $@.out - @echo - -localctx : .FORCE - ../peg -o test.peg.c test.peg - $(CC) $(CFLAGS) -o localctx localctx.c - echo 'ab.ac.ad.ae.afg.afh.afg.afh.afi.afj.' | ./$@ | $(TEE) $@.out - $(DIFF) $@.ref $@.out - rm -f $@.out - @echo - -clean : .FORCE - rm -f *~ *.o *.[pl]eg.[cd] $(EXAMPLES) - rm -rf *.dSYM - -spotless : clean - -.FORCE :