- tidies the HEADERS and SOURCES list

- makes "make install" easier to use for source-based distros


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3262 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
leander-256 2010-07-06 15:02:59 +00:00
parent 458a8faf70
commit dc67b88eb1

View File

@ -51,8 +51,32 @@ debug {
QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer
}
PUBLIC_HEADERS = rsiface/rsblogs.h \
rsiface/rschannels.h \
rsiface/rsdisc.h \
rsiface/rsdistrib.h \
rsiface/rsexpr.h \
rsiface/rsfiles.h \
rsiface/rsforums.h \
rsiface/rsgame.h \
rsiface/rsiface.h \
rsiface/rsmsgs.h \
rsiface/rsnotify.h \
rsiface/rspeers.h \
rsiface/rsphoto.h \
rsiface/rsrank.h \
rsiface/rsstatus.h \
rsiface/rstypes.h
HEADERS += $$PUBLIC_HEADERS
################################# Linux ##########################################
linux-* {
isEmpty(PREFIX) { PREFIX = /usr }
isEmpty(INC_DIR) { INC_DIR = $${PREFIX}/include/libretroshare/ }
isEmpty(LIB_DIR) { LIB_DIR = $${PREFIX}/lib/ }
DESTDIR = lib
QMAKE_CXXFLAGS *= -Wall -D_FILE_OFFSET_BITS=64
QMAKE_CC = g++
@ -77,6 +101,15 @@ linux-* {
HEADERS += upnp/UPnPBase.h
SOURCES += upnp/UPnPBase.cpp
# where to put the shared library itself
target.path = $$LIB_DIR
INSTALLS *= target
# where to put the library's interface
include_rsiface.path = $${INC_DIR}/rsiface
include_rsiface.files = $$PUBLIC_HEADERS
INSTALLS += include_rsiface
#CONFIG += version_detail_bash_script
}
@ -168,297 +201,268 @@ mac {
INCLUDEPATH += . $${UPNPC_DIR}
#INCLUDEPATH += . $${UPNPC_DIR} $${GPGME_DIR}/src $${GPG_ERROR_DIR}/src
}
################################### COMMON stuff ##################################
################################### COMMON stuff ##################################
#DEPENDPATH += . \
# util \
# tcponudp \
# serialiser \
# pqi \
# dbase \
# services \
# dht \
# upnp \
# ft \
# rsserver
HEADERS += dbase/cachestrapper.h \
dbase/fimonitor.h \
dbase/findex.h \
dbase/fistore.h
#INCLUDEPATH += . \
# util \
# tcponudp \
# serialiser \
# pqi \
# dbase \
# services \
# dht \
# upnp \
# ft \
# rsserver
HEADERS += dht/b64.h \
dht/dhtclient.h \
dht/dhthandler.h \
dht/opendht.h \
dht/opendhtmgr.h \
dht/opendhtstr.h
# Input
HEADERS += dbase/cachestrapper.h \
dbase/fimonitor.h \
dbase/findex.h \
dbase/fistore.h \
dht/b64.h \
dht/dhtclient.h \
dht/opendht.h \
dht/opendhtmgr.h \
dht/opendhtstr.h \
ft/ftcontroller.h \
ft/ftdata.h \
ft/ftdatamultiplex.h \
ft/ftdbase.h \
ft/ftextralist.h \
ft/ftfilecreator.h \
ft/ftfileprovider.h \
ft/ftfilesearch.h \
ft/ftsearch.h \
ft/ftchunkmap.h \
ft/ftserver.h \
ft/fttransfermodule.h \
# ft/ftdwlqueue.h \
pqi/sslfns.h \
pqi/authssl.h \
pqi/authssltest.h \
pqi/authgpg.h \
pqi/authgpgtest.h \
pqi/cleanupxpgp.h \
# pqi/p3authmgr.h \
pqi/p3cfgmgr.h \
pqi/p3connmgr.h \
pqi/p3dhtmgr.h \
pqi/p3notify.h \
pqi/p3upnpmgr.h \
pqi/pqi.h \
pqi/pqi_base.h \
pqi/pqiarchive.h \
pqi/pqiassist.h \
pqi/pqibin.h \
pqi/pqihandler.h \
pqi/pqihash.h \
pqi/pqiindic.h \
pqi/pqiipset.h \
pqi/pqilistener.h \
pqi/pqiloopback.h \
pqi/pqimonitor.h \
pqi/pqinetwork.h \
pqi/pqinotify.h \
pqi/pqiperson.h \
pqi/pqipersongrp.h \
pqi/pqisecurity.h \
pqi/pqiservice.h \
pqi/pqistore.h \
pqi/pqissl.h \
pqi/pqissltunnel.h \
pqi/pqissllistener.h \
pqi/pqisslpersongrp.h \
pqi/pqissludp.h \
pqi/pqistreamer.h \
rsiface/rschannels.h \
rsiface/rsdisc.h \
rsiface/rsdistrib.h \
rsiface/rsexpr.h \
rsiface/rsfiles.h \
rsiface/rsforums.h \
rsiface/rsgame.h \
rsiface/rsiface.h \
rsiface/rsmsgs.h \
rsiface/rsnotify.h \
rsiface/rspeers.h \
rsiface/rsphoto.h \
rsiface/rsblogs.h \
rsiface/rsrank.h \
rsiface/rsstatus.h \
rsiface/rstypes.h \
rsserver/p3discovery.h \
rsserver/p3face.h \
rsserver/p3msgs.h \
rsserver/p3peers.h \
rsserver/p3photo.h \
rsserver/p3rank.h \
rsserver/p3status.h \
serialiser/rsbaseitems.h \
serialiser/rsbaseserial.h \
serialiser/rschannelitems.h \
serialiser/rstunnelitems.h \
serialiser/rsconfigitems.h \
serialiser/rsdiscitems.h \
serialiser/rsdistribitems.h \
serialiser/rsforumitems.h \
serialiser/rsgameitems.h \
serialiser/rsmsgitems.h \
serialiser/rsphotoitems.h \
serialiser/rsblogitems.h \
serialiser/rsrankitems.h \
serialiser/rsserial.h \
serialiser/rsserviceids.h \
serialiser/rsserviceitems.h \
serialiser/rsstatusitems.h \
serialiser/rstlvbase.h \
serialiser/rstlvkeys.h \
serialiser/rstlvkvwide.h \
serialiser/rstlvtypes.h \
serialiser/rstlvutil.h \
serialiser/rstlvaddrs.h \
services/p3channels.h \
services/p3chatservice.h \
services/p3disc.h \
services/p3tunnel.h \
services/p3distrib.h \
services/p3forums.h \
services/p3gamelauncher.h \
services/p3gameservice.h \
services/p3msgservice.h \
services/p3photoservice.h \
services/p3blogs.h \
services/p3ranking.h \
services/p3service.h \
services/p3statusservice.h \
turtle/p3turtle.h \
turtle/turtletypes.h \
turtle/rsturtleitem.h \
tcponudp/extaddrfinder.h \
tcponudp/bio_tou.h \
tcponudp/tcppacket.h \
tcponudp/tcpstream.h \
tcponudp/tou.h \
tcponudp/tou_errno.h \
tcponudp/tou_net.h \
tcponudp/udplayer.h \
tcponudp/udpsorter.h \
upnp/upnphandler.h \
util/folderiterator.h \
util/rsdiscspace.h \
util/rsdebug.h \
util/rsdir.h \
util/rsnet.h \
util/rsprint.h \
util/rsthreads.h \
util/rswin.h \
util/rsversion.h
HEADERS += ft/ftchunkmap.h \
ft/ftcontroller.h \
ft/ftdata.h \
ft/ftdatamultiplex.h \
ft/ftdbase.h \
ft/ftextralist.h \
ft/ftfilecreator.h \
ft/ftfileprovider.h \
ft/ftfilesearch.h \
ft/ftsearch.h \
ft/ftserver.h \
ft/fttransfermodule.h
# These are test programs.... how did they get into the src list???
# dht/dht_check_peers.cc \
# dht/dht_bootstrap.cc \
HEADERS += pqi/authssl.h \
pqi/authgpg.h \
pqi/cleanupxpgp.h \
pqi/p3cfgmgr.h \
pqi/p3connmgr.h \
pqi/p3dhtmgr.h \
pqi/p3notify.h \
pqi/p3upnpmgr.h \
pqi/pqi.h \
pqi/pqi_base.h \
pqi/pqiarchive.h \
pqi/pqiassist.h \
pqi/pqibin.h \
pqi/pqihandler.h \
pqi/pqihash.h \
pqi/pqiindic.h \
pqi/pqiipset.h \
pqi/pqilistener.h \
pqi/pqiloopback.h \
pqi/pqimonitor.h \
pqi/pqinetwork.h \
pqi/pqinotify.h \
pqi/pqiperson.h \
pqi/pqipersongrp.h \
pqi/pqisecurity.h \
pqi/pqiservice.h \
pqi/pqissl.h \
pqi/pqissllistener.h \
pqi/pqisslpersongrp.h \
pqi/pqissltunnel.h \
pqi/pqissludp.h \
pqi/pqistore.h \
pqi/pqistreamer.h \
pqi/sslfns.h
SOURCES += \
pqi/sslfns.cc \
pqi/authssl.cc \
pqi/authssltest.cc \
pqi/authgpg.cc \
pqi/authgpgtest.cc \
pqi/cleanupxpgp.cc \
pqi/p3notify.cc \
pqi/pqipersongrp.cc \
pqi/pqihandler.cc \
pqi/pqiservice.cc \
pqi/pqiperson.cc \
pqi/pqissludp.cc \
pqi/pqisslpersongrp.cc \
pqi/pqissllistener.cc \
pqi/pqissl.cc \
pqi/pqissltunnel.cc \
pqi/pqistore.cc \
# pqi/p3authmgr.cc \
pqi/p3cfgmgr.cc \
pqi/p3connmgr.cc \
pqi/p3dhtmgr.cc \
pqi/pqiipset.cc \
pqi/pqiarchive.cc \
pqi/pqibin.cc \
pqi/pqimonitor.cc \
pqi/pqistreamer.cc \
pqi/pqiloopback.cc \
pqi/pqinetwork.cc \
pqi/pqisecurity.cc \
rsserver/p3face-msgs.cc \
rsserver/rsiface.cc \
rsserver/rstypes.cc \
rsserver/rsinit.cc \
rsserver/p3face-config.cc \
rsserver/p3face-server.cc \
rsserver/p3discovery.cc \
rsserver/p3msgs.cc \
rsserver/p3photo.cc \
rsserver/p3rank.cc \
rsserver/p3peers.cc \
rsserver/p3status.cc \
ft/ftcontroller.cc \
ft/ftserver.cc \
ft/ftdbase.cc \
ft/fttransfermodule.cc \
ft/ftdatamultiplex.cc \
ft/ftfilesearch.cc \
ft/ftextralist.cc \
ft/ftfilecreator.cc \
ft/ftdata.cc \
ft/ftchunkmap.cc \
ft/ftfileprovider.cc \
# ft/ftdwlqueue.cc \
dht/opendhtmgr.cc \
upnp/upnphandler.cc \
dht/opendht.cc \
dht/opendhtstr.cc \
dht/b64.cc \
services/p3channels.cc \
services/p3forums.cc \
services/p3blogs.cc \
services/p3statusservice.cc \
services/p3distrib.cc \
services/p3photoservice.cc \
services/p3disc.cc \
# removed because getPeer() dont exist services/p3tunnel.cc \
services/p3ranking.cc \
services/p3gamelauncher.cc \
services/p3msgservice.cc \
services/p3chatservice.cc \
services/p3service.cc \
turtle/p3turtle.cc \
turtle/rsturtleitem.cc \
dbase/rsexpr.cc \
dbase/cachestrapper.cc \
dbase/fistore.cc \
dbase/fimonitor.cc \
dbase/findex.cc \
serialiser/rsblogitems.cc \
serialiser/rsstatusitems.cc \
serialiser/rschannelitems.cc \
serialiser/rstunnelitems.cc \
serialiser/rsforumitems.cc \
serialiser/rsdistribitems.cc \
serialiser/rsgameitems.cc \
serialiser/rsphotoitems.cc \
serialiser/rsrankitems.cc \
serialiser/rsconfigitems.cc \
serialiser/rsdiscitems.cc \
serialiser/rsmsgitems.cc \
serialiser/rsbaseitems.cc \
serialiser/rstlvkvwide.cc \
serialiser/rstlvimage.cc \
serialiser/rstlvutil.cc \
serialiser/rstlvfileitem.cc \
serialiser/rstlvkeys.cc \
serialiser/rsbaseserial.cc \
serialiser/rstlvbase.cc \
serialiser/rstlvtypes.cc \
serialiser/rsserial.cc \
serialiser/rstlvaddrs.cc \
tcponudp/extaddrfinder.cc \
tcponudp/bss_tou.c \
tcponudp/tcpstream.cc \
tcponudp/tou.cc \
tcponudp/tcppacket.cc \
tcponudp/udpsorter.cc \
tcponudp/tou_net.cc \
tcponudp/udplayer.cc \
util/folderiterator.cc \
util/rsdiscspace.cc \
util/rsdebug.cc \
util/rsdir.cc \
util/rsnet.cc \
util/rsprint.cc \
util/rsthreads.cc \
util/rsversion.cc \
util/rswin.cc
HEADERS += rsserver/p3discovery.h \
rsserver/p3face.h \
rsserver/p3msgs.h \
rsserver/p3peers.h \
rsserver/p3photo.h \
rsserver/p3rank.h \
rsserver/p3status.h
HEADERS += serialiser/rsbaseitems.h \
serialiser/rsbaseserial.h \
serialiser/rsblogitems.h \
serialiser/rschannelitems.h \
serialiser/rsconfigitems.h \
serialiser/rsdiscitems.h \
serialiser/rsdistribitems.h \
serialiser/rsforumitems.h \
serialiser/rsgameitems.h \
serialiser/rsmsgitems.h \
serialiser/rsphotoitems.h \
serialiser/rsrankitems.h \
serialiser/rsserial.h \
serialiser/rsserviceids.h \
serialiser/rsserviceitems.h \
serialiser/rsstatusitems.h \
serialiser/rstlvaddrs.h \
serialiser/rstlvbase.h \
serialiser/rstlvkeys.h \
serialiser/rstlvkvwide.h \
serialiser/rstlvtypes.h \
serialiser/rstlvutil.h \
serialiser/rstunnelitems.h
HEADERS += services/p3blogs.h \
services/p3channels.h \
services/p3chatservice.h \
services/p3disc.h \
services/p3distrib.h \
services/p3forums.h \
services/p3gamelauncher.h \
services/p3gameservice.h \
services/p3msgservice.h \
services/p3photoservice.h \
services/p3portservice.h \
services/p3ranking.h \
services/p3service.h \
services/p3statusservice.h \
services/p3tunnel.h
HEADERS += tcponudp/bio_tou.h \
tcponudp/extaddrfinder.h \
tcponudp/tcppacket.h \
tcponudp/tcpstream.h \
tcponudp/tou.h \
tcponudp/tou_errno.h \
tcponudp/tou_net.h \
tcponudp/udplayer.h \
tcponudp/udpsorter.h \
HEADERS += turtle/p3turtle.h \
turtle/rsturtleitem.h \
turtle/turtletypes.h
HEADERS += upnp/upnphandler.h
HEADERS += util/folderiterator.h \
util/rsdebug.h \
util/rsdir.h \
util/rsdiscspace.h \
util/rsnet.h \
util/rsprint.h \
util/rsthreads.h \
util/rsversion.h \
util/rswin.h \
SOURCES += dbase/cachestrapper.cc \
dbase/fimonitor.cc \
dbase/findex.cc \
dbase/fistore.cc \
dbase/rsexpr.cc
SOURCES += dht/b64.cc \
dht/opendhtmgr.cc \
dht/opendht.cc \
dht/opendhtstr.cc
SOURCES += ft/ftchunkmap.cc \
ft/ftcontroller.cc \
ft/ftdata.cc \
ft/ftdatamultiplex.cc \
ft/ftdbase.cc \
ft/ftextralist.cc \
ft/ftfilecreator.cc \
ft/ftfileprovider.cc \
ft/ftfilesearch.cc \
ft/ftserver.cc \
ft/fttransfermodule.cc \
SOURCES += pqi/authgpg.cc \
pqi/authssl.cc \
pqi/cleanupxpgp.cc \
pqi/p3cfgmgr.cc \
pqi/p3connmgr.cc \
pqi/p3dhtmgr.cc \
pqi/p3notify.cc \
pqi/pqiarchive.cc \
pqi/pqibin.cc \
pqi/pqihandler.cc \
pqi/pqiipset.cc \
pqi/pqiloopback.cc \
pqi/pqimonitor.cc \
pqi/pqinetwork.cc \
pqi/pqiperson.cc \
pqi/pqipersongrp.cc \
pqi/pqisecurity.cc \
pqi/pqiservice.cc \
pqi/pqissl.cc \
pqi/pqissllistener.cc \
pqi/pqisslpersongrp.cc \
pqi/pqissltunnel.cc \
pqi/pqissludp.cc \
pqi/pqistore.cc \
pqi/pqistreamer.cc \
pqi/sslfns.cc
SOURCES += rsserver/p3discovery.cc \
rsserver/p3face-config.cc \
rsserver/p3face-msgs.cc \
rsserver/p3face-server.cc \
rsserver/p3msgs.cc \
rsserver/p3peers.cc \
rsserver/p3photo.cc \
rsserver/p3rank.cc \
rsserver/p3status.cc \
rsserver/rsiface.cc \
rsserver/rsinit.cc \
rsserver/rstypes.cc
SOURCES += serialiser/rsbaseitems.cc \
serialiser/rsbaseserial.cc \
serialiser/rsblogitems.cc \
serialiser/rschannelitems.cc \
serialiser/rsconfigitems.cc \
serialiser/rsdiscitems.cc \
serialiser/rsdistribitems.cc \
serialiser/rsforumitems.cc \
serialiser/rsgameitems.cc \
serialiser/rsmsgitems.cc \
serialiser/rsphotoitems.cc \
serialiser/rsrankitems.cc \
serialiser/rsserial.cc \
serialiser/rsstatusitems.cc \
serialiser/rstlvaddrs.cc \
serialiser/rstlvbase.cc \
serialiser/rstlvfileitem.cc \
serialiser/rstlvimage.cc \
serialiser/rstlvkeys.cc \
serialiser/rstlvkvwide.cc \
serialiser/rstlvtypes.cc \
serialiser/rstlvutil.cc \
serialiser/rstunnelitems.cc
SOURCES += services/p3blogs.cc \
services/p3channels.cc \
services/p3chatservice.cc \
services/p3disc.cc \
services/p3distrib.cc \
services/p3forums.cc \
services/p3gamelauncher.cc \
services/p3msgservice.cc \
services/p3photoservice.cc \
services/p3portservice.cc \
services/p3ranking.cc \
services/p3service.cc \
services/p3statusservice.cc
# removed because getPeer() doesn't exist services/p3tunnel.cc
SOURCES += tcponudp/extaddrfinder.cc \
tcponudp/largefile_tou.cc \
tcponudp/pair_tou.cc \
tcponudp/reset_tou.cc \
tcponudp/tcppacket.cc \
tcponudp/tcpstream.cc \
tcponudp/tou.cc \
tcponudp/tou_net.cc \
tcponudp/udp_server.cc \
tcponudp/udplayer.cc \
tcponudp/udpsorter.cc
SOURCES += turtle/p3turtle.cc \
turtle/rsturtleitem.cc
SOURCES += upnp/upnphandler.cc
SOURCES += util/folderiterator.cc \
util/rsdebug.cc \
util/rsdir.cc \
util/rsdiscspace.cc \
util/rsnet.cc \
util/rsprint.cc \
util/rsthreads.cc \
util/rsversion.cc \
util/rswin.cc