ensure that all libraries link against all direct dependencies

 * src/**/Makefile.*.lib: set DLL_(D)LIB correctly.  Break the dependency
   loop between libxblast and libxalgoblastdbindex by having the former
   provide only the C++ BLAST API, leaving the C core only in libblast.
 * src/build-system/library_relations.txt: Change xblast's
   relationship to blast from includes to needs, accordingly.
 * src/algo/blast/Makefile.blast_macros.mk: Add blast to BLAST_LIBS.
 * src/algo/blast/dbindex*/*/Makefile.*.app: Link against libxconnect
   rather than libconnect for consistency with libblast, which uses the
   former to keep the aforementioned cycle-breaking from causing
   inconsistency elsewhere.

Debian-Bug: 633567.
Author: Aaron M. Ucko <ucko@debian.org>
Last-Update: 2016-12-05

Gbp-Pq: Name fix_lib_deps

diff --git a/c++/src/algo/blast/api/Makefile.xblast.lib b/c++/src/algo/blast/api/Makefile.xblast.lib
index 522d5fc4e960baba977ec76c792f664e2ff28763..5853e0b40cf02bf268dd846a194a748b939b051e 100644 (file)
--- a/c++/src/algo/blast/api/Makefile.xblast.lib
+++ b/c++/src/algo/blast/api/Makefile.xblast.lib
@@ -79,11 +79,11 @@ magicblast \
 blast_node \
 blast_usage_report
 
-SRC  = $(SRC_C:%=.core_%) $(SRC_CXX)
+SRC  = $(SRC_CXX)
 
 LIB = xblast
 
-DLL_LIB = $(BLAST_LDEP) $(SOBJMGR_LIBS)
+DLL_LIB = $(BLAST_LDEP) $(SOBJMGR_LIBS) blast seqdb seqset seq general xser xconnect sequtil tables xutil xncbi
 
 CFLAGS   = $(FAST_CFLAGS) 
 CPPFLAGS = -DNCBI_MODULE=BLAST $(ORIG_CPPFLAGS)

diff --git a/c++/src/algo/blast/blastinput/Makefile.blastinput.lib b/c++/src/algo/blast/blastinput/Makefile.blastinput.lib
index cf4f3d6afdcdf96f028e043c1111edf0fe3eec3d..ae59fc545246505c605cbb754c2ac9e4530bfef0 100644 (file)
--- a/c++/src/algo/blast/blastinput/Makefile.blastinput.lib
+++ b/c++/src/algo/blast/blastinput/Makefile.blastinput.lib
@@ -27,7 +27,9 @@ SRC  = $(SRC_CXX)
 
 LIB = blastinput
 
-DLL_LIB = xblast align_format ncbi_xloader_blastdb_rmt ncbi_xloader_blastdb seqdb $(OBJREAD_LIBS) $(OBJMGR_LIBS) xutil
+    DLL_LIB = xblast align_format ncbi_xloader_blastdb_rmt ncbi_xloader_blastdb seqdb xobjread \
+              $(OBJREAD_LIBS) $(OBJMGR_LIBS) xutil ncbi_xloader_genbank ncbi_xreader_id2 ncbi_xreader \
+              scoremat seqset seq xser xutil xncbi
 
 # should be redundant, given the above :-/
 ASN_DEP = seqset xnetblast

diff --git a/c++/src/algo/blast/core/Makefile.blast.lib b/c++/src/algo/blast/core/Makefile.blast.lib
index bd4f67629694b5a8f6c7dfe94c034a1656dc650a..77ff1fab2d3166d633d275e8613e3a4a1e1b8c05 100644 (file)
--- a/c++/src/algo/blast/core/Makefile.blast.lib
+++ b/c++/src/algo/blast/core/Makefile.blast.lib
@@ -23,6 +23,7 @@ CFLAGS  = $(FAST_CFLAGS)
 LDFLAGS = $(FAST_LDFLAGS)
 WATCHERS = madden camacho fongah2
 
+DLL_LIB = composition_adjustment xconnect tables
 
 USES_LIBRARIES =  \
     composition_adjustment connect tables

diff --git a/c++/src/algo/blast/dbindex/Makefile.xalgoblastdbindex.lib b/c++/src/algo/blast/dbindex/Makefile.xalgoblastdbindex.lib
index 55ea6a523ece1c9a54e769231d60730e1bb59cac..b7948a6971ff3f39cf17ad975ad54d3d05464bd8 100644 (file)
--- a/c++/src/algo/blast/dbindex/Makefile.xalgoblastdbindex.lib
+++ b/c++/src/algo/blast/dbindex/Makefile.xalgoblastdbindex.lib
@@ -11,6 +11,8 @@ SRC = sequence_istream_fasta \
 CXXFLAGS = -DDO_INLINE $(FAST_CXXFLAGS)
 LDFLAGS  = $(FAST_LDFLAGS)
 
+DLL_LIB = blast seqdb xobjread xobjutil xobjmgr seqset seq xser xutil xncbi
+
 ASN_DEP = seqset submit
 
 WATCHERS = morgulis

diff --git a/c++/src/algo/blast/dbindex/makeindex/Makefile.makeindex.app b/c++/src/algo/blast/dbindex/makeindex/Makefile.makeindex.app
index 1214b65c89bccb129220310049ae89fe2371d724..217ee5bcdf372abed8e25275328e19ce01f906cb 100644 (file)
--- a/c++/src/algo/blast/dbindex/makeindex/Makefile.makeindex.app
+++ b/c++/src/algo/blast/dbindex/makeindex/Makefile.makeindex.app
@@ -2,7 +2,7 @@ APP = makembindex
 SRC = main mkindex_app
 
 LIB_ = xalgoblastdbindex blast composition_adjustment seqdb blastdb \
-      $(OBJREAD_LIBS) xobjutil tables connect $(SOBJMGR_LIBS)
+      $(OBJREAD_LIBS) xobjutil tables xconnect $(SOBJMGR_LIBS)
 LIB = $(LIB_:%=%$(STATIC)) $(LMDB_LIB)
 
 CXXFLAGS = $(FAST_CXXFLAGS)

diff --git a/c++/src/algo/blast/format/Makefile.xblastformat.lib b/c++/src/algo/blast/format/Makefile.xblastformat.lib
index 04a9167d045e5fad2f65ab2dc5640c020e0d4f0c..1e197b45dbd85e704abbb8fc25c009299d92cf32 100644 (file)
--- a/c++/src/algo/blast/format/Makefile.xblastformat.lib
+++ b/c++/src/algo/blast/format/Makefile.xblastformat.lib
@@ -13,6 +13,8 @@ LIBS = $(BLAST_THIRD_PARTY_LIBS) $(ORIG_LIBS)
 
 WATCHERS = jianye zaretska madden camacho fongah2
 
+DLL_LIB = xformat $(BLAST_LIBS) align_format blastxml blastxml2 \
+          xhtml xcgi xncbi
 
 USES_LIBRARIES =  \
     $(BLAST_LIBS) align_format blastxml blastxml2

diff --git a/c++/src/algo/dustmask/Makefile.xalgodustmask.lib b/c++/src/algo/dustmask/Makefile.xalgodustmask.lib
index c628ae0685443b2f5f5ff07915a2b2b43ec9f2d3..c8b9d1520734f1c831cd6ed09ec1860e599cec4e 100644 (file)
--- a/c++/src/algo/dustmask/Makefile.xalgodustmask.lib
+++ b/c++/src/algo/dustmask/Makefile.xalgodustmask.lib
@@ -8,6 +8,8 @@ LIB = xalgodustmask
 
 SRC = symdust
 
+DLL_LIB = xobjmgr seq xncbi
+
 CXXFLAGS = $(FAST_CXXFLAGS)
 LDFLAGS  = $(FAST_LDFLAGS)
 

diff --git a/c++/src/algo/segmask/Makefile.xalgosegmask.lib b/c++/src/algo/segmask/Makefile.xalgosegmask.lib
index e23a4fcad6181c66f41aaaeec21bb8e1e16a2272..63569588a1ab799a8a80d20a833cb56f5b5c9e48 100644 (file)
--- a/c++/src/algo/segmask/Makefile.xalgosegmask.lib
+++ b/c++/src/algo/segmask/Makefile.xalgosegmask.lib
@@ -8,6 +8,8 @@ LIB = xalgosegmask
 
 SRC = segmask
 
+DLL_LIB = blast xobjmgr xncbi
+
 CXXFLAGS = $(FAST_CXXFLAGS)
 LDFLAGS  = $(FAST_LDFLAGS)
 

diff --git a/c++/src/algo/winmask/Makefile.xalgowinmask.lib b/c++/src/algo/winmask/Makefile.xalgowinmask.lib
index 447449f9922c3358eddca94f03e097714ca71f53..8670dfa964b880d9c764c8d42f304c58ad40fd40 100644 (file)
--- a/c++/src/algo/winmask/Makefile.xalgowinmask.lib
+++ b/c++/src/algo/winmask/Makefile.xalgowinmask.lib
@@ -21,7 +21,7 @@ SRC = seq_masker seq_masker_score_mean seq_masker_score_mean_glob \
 CXXFLAGS = $(FAST_CXXFLAGS)
 LDFLAGS  = $(FAST_LDFLAGS)
 
-
+DLL_LIB = seqmasks_io xobjread xobjutil xobjmgr seq xncbi
 
 USES_LIBRARIES =  \
     seqmasks_io

diff --git a/c++/src/build-system/library_relations.txt b/c++/src/build-system/library_relations.txt
index 49f2a953eb561125a8a0c23f11a766b3793fe818..973c80b576411bab77ef4273d2b1b01e4a13324d 100644 (file)
--- a/c++/src/build-system/library_relations.txt
+++ b/c++/src/build-system/library_relations.txt
@@ -1603,7 +1603,7 @@ xbiosample_util needs mlacli
 xbiosample_util needs valid
 xbiosample_util needs xmlwrapp
 xbiosample_util needs xobjutil
-xblast includes blast
+xblast needs blast
 xblast needs xalgoblastdbindex
 xblast needs xalgodustmask
 xblast needs xalgowinmask

diff --git a/c++/src/cgi/Makefile.cgi.lib b/c++/src/cgi/Makefile.cgi.lib
index ebc511f72a65fe22a3168fb62de4c95485a367e8..d5a05c50e575d9b10fd8c8df52d1241dd0872b54 100644 (file)
--- a/c++/src/cgi/Makefile.cgi.lib
+++ b/c++/src/cgi/Makefile.cgi.lib
@@ -9,6 +9,8 @@ SRC = ncbicgi cgiapp cgictx ncbicgir ncbires ref_args cgi_run cgi_util \
       user_agent
 LIB = xcgi
 
+DLL_LIB = xutil xncbi
+
 CPPFLAGS = $(ORIG_CPPFLAGS) $(FASTCGI_INCLUDE)
 
 WATCHERS = vakatov

diff --git a/c++/src/connect/Makefile.xconnect.lib b/c++/src/connect/Makefile.xconnect.lib
index 8f5750e429fc501b040c0d47e122d54545fac333..41c60c3d8cdc19860958fb4b71bca96643063a95 100644 (file)
--- a/c++/src/connect/Makefile.xconnect.lib
+++ b/c++/src/connect/Makefile.xconnect.lib
@@ -13,6 +13,8 @@ UNIX_SRC = $(LOCAL_LBSM)
 
 LIB      = xconnect
 
+DLL_LIB = xncbi
+
 LIBS     = $(NETWORK_LIBS) $(ORIG_LIBS)
 
 PROJ_TAG = core

diff --git a/c++/src/corelib/Makefile.test_boost.lib b/c++/src/corelib/Makefile.test_boost.lib
index 158f0f9169d0a748121bebe21259a9a6fc4d6802..dea400846769992b70da3a8f3bdbc86c4a7db95b 100644 (file)
--- a/c++/src/corelib/Makefile.test_boost.lib
+++ b/c++/src/corelib/Makefile.test_boost.lib
@@ -3,6 +3,8 @@
 SRC = test_boost teamcity_messages
 LIB = test_boost
 
+DLL_LIB = xncbi
+
 CPPFLAGS = $(ORIG_CPPFLAGS) $(BOOST_INCLUDE)
 
 REQUIRES = Boost.Test.Included

diff --git a/c++/src/corelib/Makefile.test_mt.lib b/c++/src/corelib/Makefile.test_mt.lib
index 2292c16fe86e35d4610f361a5b937f6dc9be11e7..465e86a74fee2fece3df1e620f50fddade32a177 100644 (file)
--- a/c++/src/corelib/Makefile.test_mt.lib
+++ b/c++/src/corelib/Makefile.test_mt.lib
@@ -3,6 +3,8 @@
 SRC = test_mt
 LIB    = test_mt
 
+DLL_LIB = xncbi
+
 # REQUIRES = MT
 
 USE_PCH = no

diff --git a/c++/src/html/Makefile.html.lib b/c++/src/html/Makefile.html.lib
index 5440c0d748dff0878935ab957e6d284bda129b0b..a8ab060b7441dd239cb826cffaceea0ddf0fdede 100644 (file)
--- a/c++/src/html/Makefile.html.lib
+++ b/c++/src/html/Makefile.html.lib
@@ -7,6 +7,8 @@ SRC = node html htmlhelper page pager selection components \
       commentdiag indentstream html_exception writer_htmlenc
 LIB = xhtml
 
+DLL_LIB = xncbi
+
 WATCHERS = ivanov
 
 

diff --git a/c++/src/objects/blast/Makefile.blast.lib b/c++/src/objects/blast/Makefile.blast.lib
index c0d6d597ec8864278ef033aead7daa29980d1fbb..c410bf6bce7b5cd7931d0bdecfd866ccb5a79762 100644 (file)
--- a/c++/src/objects/blast/Makefile.blast.lib
+++ b/c++/src/objects/blast/Makefile.blast.lib
@@ -3,6 +3,8 @@ SRC = blast__ blast___ names
 
 DLL_LIB = seqset scoremat
 
+DLL_LIB = scoremat seqset seq xser xncbi
+
 WATCHERS = camacho
 
 

diff --git a/c++/src/objects/blast/Makefile.xnetblastcli.lib b/c++/src/objects/blast/Makefile.xnetblastcli.lib
index 05eb98d05bc9d472a2c61ac3a29782700072cdc1..0cbddd8714b93a2e4b06202be16f36a59ec2e38b 100644 (file)
--- a/c++/src/objects/blast/Makefile.xnetblastcli.lib
+++ b/c++/src/objects/blast/Makefile.xnetblastcli.lib
@@ -5,5 +5,7 @@ SRC = blastclient blastclient_
 
 DLL_LIB = xconnect
 
+DLL_LIB = xnetblast xconnect xser xutil xncbi
+
 USES_LIBRARIES =  \
     xconnect xnetblast

diff --git a/c++/src/objects/blastdb/Makefile.blastdb.lib b/c++/src/objects/blastdb/Makefile.blastdb.lib
index 0e33ddcf0201894cd091b631c88368d47310de5a..c85fb5f70052b0466c67a67ae72cd5cbf8cebf7c 100644 (file)
--- a/c++/src/objects/blastdb/Makefile.blastdb.lib
+++ b/c++/src/objects/blastdb/Makefile.blastdb.lib
@@ -5,6 +5,8 @@ SRC = blastdb__ blastdb___
 
 DLL_LIB = xser
 
+DLL_LIB = seq xser xncbi
+
 WATCHERS = camacho
 
 

diff --git a/c++/src/objects/blastxml/Makefile.blastxml.lib b/c++/src/objects/blastxml/Makefile.blastxml.lib
index 9eebea50391ffd4c821e01d698f370ec8cf7c188..2795e05c20120d6d65ff8fb4307c47e5afc1b671 100644 (file)
--- a/c++/src/objects/blastxml/Makefile.blastxml.lib
+++ b/c++/src/objects/blastxml/Makefile.blastxml.lib
@@ -1,6 +1,8 @@
 LIB = blastxml
 SRC = blastxml__ blastxml___
 
+DLL_LIB = xser xncbi
+
 
 USES_LIBRARIES =  \
     xser

diff --git a/c++/src/objects/blastxml2/Makefile.blastxml2.lib b/c++/src/objects/blastxml2/Makefile.blastxml2.lib
index 9269e0191da29847ec995320df39f4e7c688a557..050965b1f76df4b003c8ad5fbdc88121969dfc19 100644 (file)
--- a/c++/src/objects/blastxml2/Makefile.blastxml2.lib
+++ b/c++/src/objects/blastxml2/Makefile.blastxml2.lib
@@ -1,5 +1,7 @@
 LIB = blastxml2
 SRC = blastxml2__ blastxml2___
 
+DLL_LIB = xser xutil xncbi
+
 USES_LIBRARIES =  \
     xser

diff --git a/c++/src/objects/entrez2/Makefile.entrez2.lib b/c++/src/objects/entrez2/Makefile.entrez2.lib
index 39360dcc75f6b1827fb8f4676f8d4da1ab060e0d..e1c2585e1809a7d8f6ce7a3152ee33417b32a2c9 100644 (file)
--- a/c++/src/objects/entrez2/Makefile.entrez2.lib
+++ b/c++/src/objects/entrez2/Makefile.entrez2.lib
@@ -3,6 +3,7 @@ WATCHERS = lavr
 LIB = entrez2
 SRC = entrez2__ entrez2___
 
+DLL_LIB = xser xutil xncbi
 
 USES_LIBRARIES =  \
     xser

diff --git a/c++/src/objects/entrez2/Makefile.entrez2cli.lib b/c++/src/objects/entrez2/Makefile.entrez2cli.lib
index 2bfb592be86e29394626021b2eba8200f38cd8f9..28529c217cc7e93157b68aed1f47f8bb55e89d99 100644 (file)
--- a/c++/src/objects/entrez2/Makefile.entrez2cli.lib
+++ b/c++/src/objects/entrez2/Makefile.entrez2cli.lib
@@ -5,7 +5,7 @@ ASN_DEP = entrez2
 LIB = entrez2cli
 SRC = entrez2_client entrez2_client_
 
-DLL_LIB = entrez2 xconnect
+DLL_LIB = entrez2 xconnect xser xutil xncbi
 
 USES_LIBRARIES =  \
     entrez2 xconnect

diff --git a/c++/src/objects/gbseq/Makefile.gbseq.lib b/c++/src/objects/gbseq/Makefile.gbseq.lib
index c6f78ba4f91b92a6d4d92a47a9d27f2f11ba924b..4374b7fffbb4c83fae4ae3d4053eb5f8434255c6 100644 (file)
--- a/c++/src/objects/gbseq/Makefile.gbseq.lib
+++ b/c++/src/objects/gbseq/Makefile.gbseq.lib
@@ -1,6 +1,7 @@
 LIB = gbseq
 SRC = gbseq__ gbseq___
 
+DLL_LIB = xser xutil xncbi
 
 USES_LIBRARIES =  \
     xser

diff --git a/c++/src/objects/genomecoll/Makefile.genome_collection.lib b/c++/src/objects/genomecoll/Makefile.genome_collection.lib
index 82906c32b9bec58ab2e30d67c2e88c2551bf7bbd..8f5881e19dc27d483133cb12c87c4731fc8fea51 100644 (file)
--- a/c++/src/objects/genomecoll/Makefile.genome_collection.lib
+++ b/c++/src/objects/genomecoll/Makefile.genome_collection.lib
@@ -3,6 +3,8 @@
 LIB = genome_collection
 SRC = genome_collection__ genome_collection___
 
+DLL_LIB = seq general xser xncbi
+
 WATCHERS = dicuccio smithrg zherikov
 
 

diff --git a/c++/src/objects/id1/Makefile.id1.lib b/c++/src/objects/id1/Makefile.id1.lib
index 3d978e28054b41f5f1b86c811a145f9f5cf79332..348686bc779dc1ff29b65b64363b3be3429f72f6 100644 (file)
--- a/c++/src/objects/id1/Makefile.id1.lib
+++ b/c++/src/objects/id1/Makefile.id1.lib
@@ -5,6 +5,8 @@ SRC = id1__ id1___
 
 DLL_LIB = seqset
 
+DLL_LIB = seqset seq xser xncbi
+
 WATCHERS = vasilche
 
 

diff --git a/c++/src/objects/id2/Makefile.id2.lib b/c++/src/objects/id2/Makefile.id2.lib
index d1659ae0426e39a523654123c461d12646518400..d1beec785efe78287cdec2d27653a4907a16ce1c 100644 (file)
--- a/c++/src/objects/id2/Makefile.id2.lib
+++ b/c++/src/objects/id2/Makefile.id2.lib
@@ -1,6 +1,8 @@
 LIB = id2
 SRC = id2__ id2___
 
+DLL_LIB = seqsplit seq xser xncbi
+
 WATCHERS = vasilche
 
 USES_LIBRARIES =  \

diff --git a/c++/src/objects/medlars/Makefile.medlars.lib b/c++/src/objects/medlars/Makefile.medlars.lib
index 92ffbf80bb57ea2d5256bdc358d3b0b93c7fa6e0..e9e95abc32eea27aefa5092e77921da857461bc0 100644 (file)
--- a/c++/src/objects/medlars/Makefile.medlars.lib
+++ b/c++/src/objects/medlars/Makefile.medlars.lib
@@ -1,6 +1,7 @@
 LIB = medlars
 SRC = medlars__ medlars___
 
+DLL_LIB = biblio xser xutil xncbi
 
 USES_LIBRARIES =  \
     biblio

diff --git a/c++/src/objects/medline/Makefile.medline.lib b/c++/src/objects/medline/Makefile.medline.lib
index cfac0b8b59ca8251c76ce638df77398cc6a81858..a01c0fa977e253800f47d5db59f6fb0d338c685e 100644 (file)
--- a/c++/src/objects/medline/Makefile.medline.lib
+++ b/c++/src/objects/medline/Makefile.medline.lib
@@ -1,7 +1,7 @@
 LIB = medline
 SRC = medline__ medline___
 
-DLL_LIB = biblio general
+DLL_LIB = biblio general xser xncbi
 
 USES_LIBRARIES =  \
     biblio

diff --git a/c++/src/objects/mla/Makefile.mla.lib b/c++/src/objects/mla/Makefile.mla.lib
index cd3cc3a19285eeb9c1de5beb773047a614bdd648..31bf263e8295b5ca21573a8df35d872c8369c663 100644 (file)
--- a/c++/src/objects/mla/Makefile.mla.lib
+++ b/c++/src/objects/mla/Makefile.mla.lib
@@ -1,6 +1,7 @@
 LIB = mla
 SRC = mla__ mla___
 
+DLL_LIB = medlars pub pubmed xser xutil xncbi
 
 USES_LIBRARIES =  \
     medlars pub pubmed

diff --git a/c++/src/objects/mla/Makefile.mlacli.lib b/c++/src/objects/mla/Makefile.mlacli.lib
index b1995e8dfdce143fac72706288d9242b564f2647..5536516030a47300a7c9d2cb8eb61cd0661c9c11 100644 (file)
--- a/c++/src/objects/mla/Makefile.mlacli.lib
+++ b/c++/src/objects/mla/Makefile.mlacli.lib
@@ -5,5 +5,7 @@ SRC = mla_client mla_client_
 
 DLL_LIB = mla pubmed medlars xconnect
 
+DLL_LIB = mla xconnect xser xutil xncbi
+
 USES_LIBRARIES =  \
     mla xconnect

diff --git a/c++/src/objects/pub/Makefile.pub.lib b/c++/src/objects/pub/Makefile.pub.lib
index e1de64952b13893c38a37e2979e091bcbcdddbcb..4082f0c3d1df4e8d188988dff71af21a0e831417 100644 (file)
--- a/c++/src/objects/pub/Makefile.pub.lib
+++ b/c++/src/objects/pub/Makefile.pub.lib
@@ -1,7 +1,7 @@
 LIB = pub
 SRC = pub__ pub___
 
-DLL_LIB = medline biblio
+DLL_LIB = medline biblio xser xncbi
 
 USES_LIBRARIES =  \
     medline

diff --git a/c++/src/objects/pubmed/Makefile.pubmed.lib b/c++/src/objects/pubmed/Makefile.pubmed.lib
index 19e11d7b7e12139617bea6458c92dea3c4a79ff3..0a45492cb4b0fe7926050a341fccabb7326b74c5 100644 (file)
--- a/c++/src/objects/pubmed/Makefile.pubmed.lib
+++ b/c++/src/objects/pubmed/Makefile.pubmed.lib
@@ -1,6 +1,7 @@
 LIB = pubmed
 SRC = pubmed__ pubmed___
 
+DLL_LIB = medline biblio xser xutil xncbi
 
 USES_LIBRARIES =  \
     medline

diff --git a/c++/src/objects/scoremat/Makefile.scoremat.lib b/c++/src/objects/scoremat/Makefile.scoremat.lib
index a83215d8f973f3634c532cf7433699896a4b0536..4651df1e6dfe1e81184caccf62d9bbc7eb4a61e6 100644 (file)
--- a/c++/src/objects/scoremat/Makefile.scoremat.lib
+++ b/c++/src/objects/scoremat/Makefile.scoremat.lib
@@ -1,7 +1,7 @@
 LIB = scoremat
 SRC = scoremat__ scoremat___
 
-DLL_LIB = seqset
+DLL_LIB = seqset seq general xser xncbi
 
 USES_LIBRARIES =  \
     seqset

diff --git a/c++/src/objects/seq/Makefile.seq.lib b/c++/src/objects/seq/Makefile.seq.lib
index a394d281f71ca73968a3cacc3c2f2bbdc3aaa42a..4fcf9243f715aa3f9b8af714ec2919643c38a2e1 100644 (file)
--- a/c++/src/objects/seq/Makefile.seq.lib
+++ b/c++/src/objects/seq/Makefile.seq.lib
@@ -12,7 +12,7 @@ SRC = $(ASN:%=%__) $(ASN:%=%___) seqport_util \
       seq_loc_mapper_base seq_align_mapper_base seqlocinfo so_map \
       seq_loc_from_string seq_loc_reverse_complementer
 
-DLL_LIB = seqcode pub general xser sequtil
+DLL_LIB = seqcode pub biblio general xser sequtil xutil xncbi
 
 WATCHERS = vasilche grichenk bollin ludwigf
 

diff --git a/c++/src/objects/seqcode/Makefile.seqcode.lib b/c++/src/objects/seqcode/Makefile.seqcode.lib
index e1a7bf4064341ff498937cd901cd0c3c88b7d83c..869368fe6d755dd1fa4ebec09457939e1a36e64c 100644 (file)
--- a/c++/src/objects/seqcode/Makefile.seqcode.lib
+++ b/c++/src/objects/seqcode/Makefile.seqcode.lib
@@ -1,6 +1,8 @@
 LIB = seqcode
 SRC = seqcode__ seqcode___
 
+DLL_LIB = xser xncbi
+
 
 USES_LIBRARIES =  \
     xser

diff --git a/c++/src/objects/seqedit/Makefile.seqedit.lib b/c++/src/objects/seqedit/Makefile.seqedit.lib
index 4ee708fc8577fa610e2d0b78ca1cd2bd671d8a94..a23ede985d65f7c96d01d7216e7fafb41518bc42 100644 (file)
--- a/c++/src/objects/seqedit/Makefile.seqedit.lib
+++ b/c++/src/objects/seqedit/Makefile.seqedit.lib
@@ -1,6 +1,7 @@
 LIB = seqedit
 SRC = seqedit__ seqedit___
- 
+
+DLL_LIB = seqset seq general xser xncbi
 
 
 USES_LIBRARIES =  \

diff --git a/c++/src/objects/seqset/Makefile.seqset.lib b/c++/src/objects/seqset/Makefile.seqset.lib
index 7b44c907a693ceb02e793bcac7a7dfe078e4d600..595d9a9037422b4a74d5633401a2a2c3253a6471 100644 (file)
--- a/c++/src/objects/seqset/Makefile.seqset.lib
+++ b/c++/src/objects/seqset/Makefile.seqset.lib
@@ -1,7 +1,7 @@
 LIB = seqset
 SRC = seqset__ seqset___ gb_release_file
 
-DLL_LIB = $(SEQ_LIBS)
+DLL_LIB = $(SEQ_LIBS) xser xncbi
 
 USES_LIBRARIES =  \
     $(SEQ_LIBS) pub

diff --git a/c++/src/objects/seqsplit/Makefile.seqsplit.lib b/c++/src/objects/seqsplit/Makefile.seqsplit.lib
index bf17f46f68a5228a780c7c81b7cbad8a4975c3ae..bef22f168c2f175e7be04a5e2e7ac74f8c1570b7 100644 (file)
--- a/c++/src/objects/seqsplit/Makefile.seqsplit.lib
+++ b/c++/src/objects/seqsplit/Makefile.seqsplit.lib
@@ -1,6 +1,8 @@
 LIB = seqsplit
 SRC = seqsplit__ seqsplit___
 
+DLL_LIB = seqset seq xser xncbi
+
 WATCHERS = vasilche
 
 

diff --git a/c++/src/objects/submit/Makefile.submit.lib b/c++/src/objects/submit/Makefile.submit.lib
index 2577b2e0bdf1e48a04ad6a323c2c0774f9b7346e..5d401780616bde2173f2b3d80eeec2c575a04c72 100644 (file)
--- a/c++/src/objects/submit/Makefile.submit.lib
+++ b/c++/src/objects/submit/Makefile.submit.lib
@@ -1,6 +1,8 @@
 LIB = submit
 SRC = submit__ submit___
 
+DLL_LIB = seqset seq biblio general xser xncbi
+
 
 USES_LIBRARIES =  \
     seqset

diff --git a/c++/src/objects/taxon1/Makefile.taxon1.lib b/c++/src/objects/taxon1/Makefile.taxon1.lib
index 4d8c561e46a2a9d0923c4724553921c3e4aea12b..c7349389feed59e721bdfe9ad0b93a1111fb710a 100644 (file)
--- a/c++/src/objects/taxon1/Makefile.taxon1.lib
+++ b/c++/src/objects/taxon1/Makefile.taxon1.lib
@@ -7,6 +7,7 @@ DLL_LIB = xconnect
 
 WATCHERS = domrach
 
+DLL_LIB = xconnect seq xser xutil xncbi
 
 USES_LIBRARIES =  \
     $(SEQ_LIBS) pub xconnect

diff --git a/c++/src/objects/taxon3/Makefile.taxon3.lib b/c++/src/objects/taxon3/Makefile.taxon3.lib
index b86ca585dccb386d0fb566b30529068e18d7c77b..356c89af3b6be48cc0219fe8d8539b91b158b575 100644 (file)
--- a/c++/src/objects/taxon3/Makefile.taxon3.lib
+++ b/c++/src/objects/taxon3/Makefile.taxon3.lib
@@ -8,6 +8,7 @@ DLL_LIB = xconnect
 
 WATCHERS = bollin holmesbr
 
+DLL_LIB = xconnect seq xser xutil xncbi
 
 USES_LIBRARIES =  \
     $(SEQ_LIBS) pub xconnect

diff --git a/c++/src/objects/valerr/Makefile.valerr.lib b/c++/src/objects/valerr/Makefile.valerr.lib
index c00a60557e06e37e2177e06992557745f1b93cb3..d1cbcccc0ee54d64ca28edd24df87346b89d7eec 100644 (file)
--- a/c++/src/objects/valerr/Makefile.valerr.lib
+++ b/c++/src/objects/valerr/Makefile.valerr.lib
@@ -3,6 +3,7 @@ SRC = valerr__ valerr___
 
 ASN_DEP = seqset
 
+DLL_LIB = xser xutil xncbi
 
 USES_LIBRARIES =  \
     xser

diff --git a/c++/src/objects/valid/Makefile.valid.lib b/c++/src/objects/valid/Makefile.valid.lib
index aefdc2674b5725450c5108aa123be7c3cc213759..23438f8ba971b080188c5b171debe1bebf433754 100644 (file)
--- a/c++/src/objects/valid/Makefile.valid.lib
+++ b/c++/src/objects/valid/Makefile.valid.lib
@@ -6,5 +6,7 @@ DLL_LIB = xregexp
 
 ASN_DEP = general
 
+DLL_LIB = general xser xregexp xutil xncbi
+
 USES_LIBRARIES =  \
     general xregexp

diff --git a/c++/src/objects/variation/Makefile.variation.lib b/c++/src/objects/variation/Makefile.variation.lib
index ea013fbcfb8a99ea0e5fa11da63451621b245bfd..a6dcb8349721875595e3a5fcba8e8140daf87db7 100644 (file)
--- a/c++/src/objects/variation/Makefile.variation.lib
+++ b/c++/src/objects/variation/Makefile.variation.lib
@@ -1,6 +1,7 @@
 LIB = variation
 SRC = variation__ variation___
 
+DLL_LIB = seq xser xutil xncbi
 
 USES_LIBRARIES =  \
     $(SEQ_LIBS) pub

diff --git a/c++/src/objmgr/split/Makefile.id2_split.lib b/c++/src/objmgr/split/Makefile.id2_split.lib
index b12ccfd393b091f9e56ad71677dee30d73af3586..e21774893f13ade9bd6c308d89a2381de4b8f9a3 100644 (file)
--- a/c++/src/objmgr/split/Makefile.id2_split.lib
+++ b/c++/src/objmgr/split/Makefile.id2_split.lib
@@ -17,7 +17,7 @@ LIB = id2_split
 
 CPPFLAGS = $(ORIG_CPPFLAGS) $(CMPRS_INCLUDE)
 
-DLL_LIB = $(SOBJMGR_LIBS)
+DLL_LIB = xobjmgr seqsplit seqset seq general xser xcompress xncbi
 
 WATCHERS = vasilche
 

diff --git a/c++/src/objmgr/util/Makefile.util.lib b/c++/src/objmgr/util/Makefile.util.lib
index 3387d795fa6d28cbf6d0b105f222b17d83c31d2c..1fb5a8859eb6480bcc8356b01975bb1eb4457155 100644 (file)
--- a/c++/src/objmgr/util/Makefile.util.lib
+++ b/c++/src/objmgr/util/Makefile.util.lib
@@ -14,6 +14,8 @@ LIB = xobjutil
 
 DLL_LIB = submit $(SOBJMGR_LIBS)
 
+DLL_LIB = xobjmgr seqset seq pub biblio general xser sequtil xutil xncbi
+
 WATCHERS = ucko vasilche
 
 

diff --git a/c++/src/objtools/align_format/Makefile.align_format.lib b/c++/src/objtools/align_format/Makefile.align_format.lib
index 87bccf0f33c45f985e41e1bd236562cfa033bbd4..ea2e843e96e24525452d0ff61726e180ed9125aa 100644 (file)
--- a/c++/src/objtools/align_format/Makefile.align_format.lib
+++ b/c++/src/objtools/align_format/Makefile.align_format.lib
@@ -15,6 +15,10 @@ CPPFLAGS = -DNCBI_MODULE=BLASTFORMAT $(ORIG_CPPFLAGS)
 
 LIBS = $(BLAST_THIRD_PARTY_LIBS) $(ORIG_LIBS)
 
+DLL_LIB = xalnmgr ncbi_xloader_genbank seqdb blast_services xobjread xobjutil \
+          xobjmgr xnetblast blastdb gene_info taxon1 seqset seq general xser \
+          xcgi xhtml tables xncbi
+
 ###  EXAMPLES OF OTHER SETTINGS THAT MIGHT BE OF INTEREST
 # CFLAGS   = $(FAST_CFLAGS)
 # CXXFLAGS = $(FAST_CXXFLAGS)

diff --git a/c++/src/objtools/alnmgr/Makefile.alnmgr.lib b/c++/src/objtools/alnmgr/Makefile.alnmgr.lib
index f762fb13c4070a1a90762bb87c32dae34f204f1d..3ce898cee8536f324d621b686cf1b5ff6a451bc7 100644 (file)
--- a/c++/src/objtools/alnmgr/Makefile.alnmgr.lib
+++ b/c++/src/objtools/alnmgr/Makefile.alnmgr.lib
@@ -14,6 +14,7 @@ DLL_LIB = xobjutil tables
 
 WATCHERS = grichenk
 
+DLL_LIB = xobjutil xobjmgr seqset seq xser tables xncbi
 
 USES_LIBRARIES =  \
     tables xobjutil

diff --git a/c++/src/objtools/blast/blastdb_format/Makefile.blastdb_format.lib b/c++/src/objtools/blast/blastdb_format/Makefile.blastdb_format.lib
index f9096871bce03b87fa617445555e678e2d7fb97a..233ade3616459324a9cf5bb205b6b35fdbce6aab 100644 (file)
--- a/c++/src/objtools/blast/blastdb_format/Makefile.blastdb_format.lib
+++ b/c++/src/objtools/blast/blastdb_format/Makefile.blastdb_format.lib
@@ -11,6 +11,7 @@ SRC = seq_writer blastdb_dataextract blastdb_formatter seq_formatter
 
 CPPFLAGS = -DNCBI_MODULE=BLASTDB $(ORIG_CPPFLAGS)
 
+DLL_LIB = seqdb xobjutil xobjmgr seq xser sequtil xutil xncbi
 
 ###  EXAMPLES OF OTHER SETTINGS THAT MIGHT BE OF INTEREST
 # CFLAGS   = $(FAST_CFLAGS)

diff --git a/c++/src/objtools/blast/gene_info_reader/Makefile.gene_info.lib b/c++/src/objtools/blast/gene_info_reader/Makefile.gene_info.lib
index 26b292287494a934d8c182e6cdd45e73b0695f52..0777632ac99ae25c89de2b118a31f6ec71e9be41 100644 (file)
--- a/c++/src/objtools/blast/gene_info_reader/Makefile.gene_info.lib
+++ b/c++/src/objtools/blast/gene_info_reader/Makefile.gene_info.lib
@@ -6,6 +6,7 @@ CPPFLAGS = -DNCBI_MODULE=GENEINFO $(ORIG_CPPFLAGS)
 LIB = gene_info
 SRC = gene_info gene_info_reader file_utils
 
+DLL_LIB = xncbi
 
 USES_LIBRARIES =  \
     xncbi

diff --git a/c++/src/objtools/blast/seqdb_reader/Makefile.seqdb.lib b/c++/src/objtools/blast/seqdb_reader/Makefile.seqdb.lib
index 47fd3c280eb80e70b016f79271a053120c126f5a..b9feaf99522bc532ba86d709be163bc9b02b53ea 100644 (file)
--- a/c++/src/objtools/blast/seqdb_reader/Makefile.seqdb.lib
+++ b/c++/src/objtools/blast/seqdb_reader/Makefile.seqdb.lib
@@ -29,6 +29,8 @@ LIB = seqdb
 DLL_LIB = blastdb $(SOBJMGR_LIBS) $(LMDB_LIB)
 LIBS = $(BLAST_THIRD_PARTY_LIBS)
 
+DLL_LIB = blastdb xobjmgr seq general xser sequtil xncbi
+
 CFLAGS   = $(FAST_CFLAGS)
 CPPFLAGS = -DNCBI_MODULE=BLASTDB $(ORIG_CPPFLAGS) $(BLAST_THIRD_PARTY_INCLUDE) 
 CXXFLAGS = $(FAST_CXXFLAGS)

diff --git a/c++/src/objtools/blast/seqdb_writer/Makefile.writedb.lib b/c++/src/objtools/blast/seqdb_writer/Makefile.writedb.lib
index c9a026fb48876ba4c118550cd166392a2f142b7f..49a3668642572e9bbc6cb1bfcfd324a2885e97e0 100644 (file)
--- a/c++/src/objtools/blast/seqdb_writer/Makefile.writedb.lib
+++ b/c++/src/objtools/blast/seqdb_writer/Makefile.writedb.lib
@@ -11,6 +11,9 @@ DLL_LIB = blastdb $(SOBJMGR_LIBS)
 
 LIB = writedb
 
+DLL_LIB = seqdb xobjread xobjmgr blastdb seqset seq general \
+          xser sequtil xutil xncbi
+
 CFLAGS   = $(FAST_CFLAGS)
 CPPFLAGS = -DNCBI_MODULE=BLASTDB $(ORIG_CPPFLAGS)  $(BLAST_THIRD_PARTY_INCLUDE)
 CXXFLAGS = $(FAST_CXXFLAGS)

diff --git a/c++/src/objtools/blast/services/Makefile.blast_services.lib b/c++/src/objtools/blast/services/Makefile.blast_services.lib
index 8d2fee280cc1e23fa7cc113cf07954a1c712f16f..c794e023c62b6e2565cba3bab54cf328034f2123 100644 (file)
--- a/c++/src/objtools/blast/services/Makefile.blast_services.lib
+++ b/c++/src/objtools/blast/services/Makefile.blast_services.lib
@@ -10,6 +10,8 @@ LIB = blast_services
 
 DLL_LIB = xnetblastcli xnetblast
 
+DLL_LIB = xnetblastcli xnetblast xser xconnect xutil xncbi
+
 CFLAGS   = $(FAST_CFLAGS)
 # -DNCBI_MODULE=NETBLAST moved to blast_services.*pp to avoid misnamed modules in DLL configurations
 CPPFLAGS = $(ORIG_CPPFLAGS)

diff --git a/c++/src/objtools/cleanup/Makefile.cleanup.lib b/c++/src/objtools/cleanup/Makefile.cleanup.lib
index cbb4e689982d748b243a8ff81575088cc409158d..3f1b22f0d65440352501a420345c1d7b48d52f63 100644 (file)
--- a/c++/src/objtools/cleanup/Makefile.cleanup.lib
+++ b/c++/src/objtools/cleanup/Makefile.cleanup.lib
@@ -11,7 +11,7 @@ SRC = autogenerated_cleanup autogenerated_extended_cleanup cleanup \
       cleanup_pub newcleanupp capitalization_string fix_feature_id \
       cleanup_message
 
-DLL_LIB = $(OBJEDIT_LIBS) xregexp $(PCRE_LIB)
+DLL_LIB = $(OBJEDIT_LIBS) xobjutil valid xregexp $(PCRE_LIB) $(SOBJMGR_LIBS)
 LIB = xcleanup
 
 LIBS = $(PCRE_LIBS)

diff --git a/c++/src/objtools/data_loaders/blastdb/Makefile.ncbi_xloader_blastdb.lib b/c++/src/objtools/data_loaders/blastdb/Makefile.ncbi_xloader_blastdb.lib
index e2f9bcf597e5c2dba60617cf811bec8260b9460e..df53141d4d6382df66e018eceb968428e501f1ca 100644 (file)
--- a/c++/src/objtools/data_loaders/blastdb/Makefile.ncbi_xloader_blastdb.lib
+++ b/c++/src/objtools/data_loaders/blastdb/Makefile.ncbi_xloader_blastdb.lib
@@ -3,7 +3,7 @@
 LIB = ncbi_xloader_blastdb
 SRC = bdbloader cached_sequence local_blastdb_adapter
 
-DLL_LIB = seqdb
+DLL_LIB = seqdb xobjmgr seqset seq xncbi
 
 CPPFLAGS = -DNCBI_MODULE=BLASTDB $(ORIG_CPPFLAGS)
 

diff --git a/c++/src/objtools/data_loaders/blastdb/Makefile.ncbi_xloader_blastdb_rmt.lib b/c++/src/objtools/data_loaders/blastdb/Makefile.ncbi_xloader_blastdb_rmt.lib
index 7228f3e5be1f6e8c9ae1eca019c09223d8de6a48..4a0b2417c4aa122389a96c157de1883c5795de9d 100644 (file)
--- a/c++/src/objtools/data_loaders/blastdb/Makefile.ncbi_xloader_blastdb_rmt.lib
+++ b/c++/src/objtools/data_loaders/blastdb/Makefile.ncbi_xloader_blastdb_rmt.lib
@@ -7,6 +7,8 @@ DLL_LIB = blast_services
 
 CPPFLAGS = -DNCBI_MODULE=BLASTDB $(ORIG_CPPFLAGS)
 
+DLL_LIB = ncbi_xloader_blastdb blast_services xobjmgr seq xncbi
+
 ASN_DEP = blastdb xnetblast
 
 WATCHERS = camacho

diff --git a/c++/src/objtools/data_loaders/genbank/Makefile.ncbi_xloader_genbank.lib b/c++/src/objtools/data_loaders/genbank/Makefile.ncbi_xloader_genbank.lib
index 1c6004f8823a0f756562ec284fc63dd01db6a02c..b39e89e36fd12e8667c7c07a45e0c17565f9e55c 100644 (file)
--- a/c++/src/objtools/data_loaders/genbank/Makefile.ncbi_xloader_genbank.lib
+++ b/c++/src/objtools/data_loaders/genbank/Makefile.ncbi_xloader_genbank.lib
@@ -12,6 +12,10 @@ LIB_OR_DLL = both
 # Dependencies for shared library
 DLL_LIB = general ncbi_xreader$(DLL) $(GENBANK_PSG_CLIENT_LDEP)
 
+DLL_DLIB = ncbi_xreader_cache ncbi_xreader_id1 ncbi_xreader_id2 \
+           id2 id1 ncbi_xreader $(GENBANK_PSG_CLIENT_LDEP) xobjmgr \
+           seq xutil xncbi
+
 LIBS = $(GENBANK_THIRD_PARTY_LIBS) $(CMPRS_LIBS) $(ORIG_LIBS)
 
 CPPFLAGS = $(ORIG_CPPFLAGS) $(CMPRS_INCLUDE)

diff --git a/c++/src/objtools/data_loaders/genbank/Makefile.ncbi_xreader.lib b/c++/src/objtools/data_loaders/genbank/Makefile.ncbi_xreader.lib
index f0fb8e0f60ab79bbeb353b792e3a96bd62f21f26..4dc0935669c8c05dd3f1e55282b4f2cdb7b533a5 100644 (file)
--- a/c++/src/objtools/data_loaders/genbank/Makefile.ncbi_xreader.lib
+++ b/c++/src/objtools/data_loaders/genbank/Makefile.ncbi_xreader.lib
@@ -16,6 +16,9 @@ DLL_LIB = $(GENBANK_READER_LDEP)
 
 LIBS = $(CMPRS_LIBS) $(NETWORK_LIBS) $(DL_LIBS) $(ORIG_LIBS)
 
+DLL_DLIB = xobjmgr id2 seqsplit id1 seqset seq general \
+           xser xconnect xcompress xutil xncbi
+
 WATCHERS = vasilche
 
 

diff --git a/c++/src/objtools/data_loaders/genbank/cache/Makefile.ncbi_xreader_cache.lib b/c++/src/objtools/data_loaders/genbank/cache/Makefile.ncbi_xreader_cache.lib
index e88475d6d29ea28171bf30b0b0098cc68c8be3a1..67e99b261b3ab1656676b6af67f3ab350bd7ad59 100644 (file)
--- a/c++/src/objtools/data_loaders/genbank/cache/Makefile.ncbi_xreader_cache.lib
+++ b/c++/src/objtools/data_loaders/genbank/cache/Makefile.ncbi_xreader_cache.lib
@@ -12,6 +12,8 @@ LIB_OR_DLL = both
 # Dependencies for shared library
 DLL_LIB = ncbi_xreader$(DLL)
 
+DLL_DLIB = ncbi_xreader xobjmgr seq xser xncbi
+
 CPPFLAGS = $(ORIG_CPPFLAGS) $(CMPRS_INCLUDE)
 
 WATCHERS = vasilche

diff --git a/c++/src/objtools/data_loaders/genbank/id1/Makefile.ncbi_xreader_id1.lib b/c++/src/objtools/data_loaders/genbank/id1/Makefile.ncbi_xreader_id1.lib
index abce7716ddb9e9f44e0ab9326b16b5ab524a75f4..b0ee90f9d721e1a3932e6824a2fd5104ac9e9cf3 100644 (file)
--- a/c++/src/objtools/data_loaders/genbank/id1/Makefile.ncbi_xreader_id1.lib
+++ b/c++/src/objtools/data_loaders/genbank/id1/Makefile.ncbi_xreader_id1.lib
@@ -12,6 +12,8 @@ LIB_OR_DLL = both
 # Dependencies for shared library
 DLL_LIB = ncbi_xreader$(DLL) $(GENBANK_READER_LDEP)
 
+DLL_DLIB = ncbi_xreader xobjmgr id1 seq general xser xconnect xutil xncbi
+
 CPPFLAGS = $(ORIG_CPPFLAGS) $(CMPRS_INCLUDE)
 
 WATCHERS = vasilche

diff --git a/c++/src/objtools/data_loaders/genbank/id2/Makefile.ncbi_xreader_id2.lib b/c++/src/objtools/data_loaders/genbank/id2/Makefile.ncbi_xreader_id2.lib
index b8dfdb95d0737c1e3fafdc80ec16ae9c25f88c86..f8ca7bf8184a936b766711459f74f7c28c0f9659 100644 (file)
--- a/c++/src/objtools/data_loaders/genbank/id2/Makefile.ncbi_xreader_id2.lib
+++ b/c++/src/objtools/data_loaders/genbank/id2/Makefile.ncbi_xreader_id2.lib
@@ -12,7 +12,10 @@ LIB_OR_DLL = both
 CPPFLAGS = $(ORIG_CPPFLAGS) $(Z_INCLUDE)
 
 # Dependencies for shared library (disabled due to problems on Darwin)
-# DLL_LIB = xconnect ncbi_xreader$(DLL)
+DLL_LIB = xconnect ncbi_xreader$(DLL)
+
+DLL_DLIB = ncbi_xreader xobjmgr id2 seqsplit seq xser xconnect xncbi
+
 
 WATCHERS = vasilche
 

diff --git a/c++/src/objtools/format/Makefile.xformat.lib b/c++/src/objtools/format/Makefile.xformat.lib
index 2c2fa6abb9ea67ae0187e92636fbd99cb9d58a2f..cf6cd00c2adfe89b74b1c0747a89d46b5c8dfd4d 100644 (file)
--- a/c++/src/objtools/format/Makefile.xformat.lib
+++ b/c++/src/objtools/format/Makefile.xformat.lib
@@ -22,6 +22,8 @@ DLL_LIB = xalnmgr xconnect
 
 WATCHERS = ludwigf dicuccio
 
+DLL_LIB = xcleanup valid gbseq mlacli mla medlars pubmed submit xalnmgr \
+          xobjutil taxon3 $(SOBJMGR_LIBS)
 
 USES_LIBRARIES =  \
     gbseq mlacli xalnmgr xcleanup

diff --git a/c++/src/objtools/readers/Makefile.xobjread.lib b/c++/src/objtools/readers/Makefile.xobjread.lib
index ceed3794ac9bb76f1ecf59159ee89af353504cb4..07cb4de8597e1fe040fb6d575974bc9af8222429 100644 (file)
--- a/c++/src/objtools/readers/Makefile.xobjread.lib
+++ b/c++/src/objtools/readers/Makefile.xobjread.lib
@@ -29,6 +29,6 @@ SRC = reader_message reader_listener reader_message_handler \
       message_listener line_error
 
 
-DLL_LIB = submit seqset $(SEQ_LIBS) general xutil xlogging
+DLL_LIB = submit seqset $(SEQ_LIBS) general xutil xlogging pub xser xncbi
 
 USES_LIBRARIES = submit xlogging

diff --git a/c++/src/objtools/seqmasks_io/Makefile.seqmasks_io.lib b/c++/src/objtools/seqmasks_io/Makefile.seqmasks_io.lib
index ad8c50d5bf6403b986f734602784046e437461ff..6b21fb8d625561b0ab63a22ecdaedbca88fb5d63 100644 (file)
--- a/c++/src/objtools/seqmasks_io/Makefile.seqmasks_io.lib
+++ b/c++/src/objtools/seqmasks_io/Makefile.seqmasks_io.lib
@@ -12,7 +12,7 @@ mask_writer_seqloc \
 mask_writer_blastdb_maskinfo
 
 ASN_DEP = seqset
-DLL_LIB = seqdb blastdb
+DLL_LIB = seqdb xobjread xobjutil xobjmgr blastdb seqset seq xser xncbi
 
 LIBS = $(BLAST_THIRD_PARTY_LIBS) $(ORIG_LIBS)
 

diff --git a/c++/src/objtools/simple/Makefile.xobjsimple.lib b/c++/src/objtools/simple/Makefile.xobjsimple.lib
index 474723cc429da98668a0e37d22234ccf8e8d69a1..e77514765603f951c4629145815c7207093798d9 100644 (file)
--- a/c++/src/objtools/simple/Makefile.xobjsimple.lib
+++ b/c++/src/objtools/simple/Makefile.xobjsimple.lib
@@ -7,6 +7,8 @@ WATCHERS =  jcherry
 
 ASN_DEP = seqset
 
+DLL_LIB = ncbi_xloader_genbank xobjmgr seq xncbi
+
 LIB = xobjsimple
 SRC = simple_om
 

diff --git a/c++/src/serial/Makefile.serial.lib b/c++/src/serial/Makefile.serial.lib
index 082d11016ee4688555f974f6d843518676bc7ef3..e7696b5940ebfd290e782252d59dd32b1b65ff7a 100644 (file)
--- a/c++/src/serial/Makefile.serial.lib
+++ b/c++/src/serial/Makefile.serial.lib
@@ -20,6 +20,8 @@ LIB    = xser
 
 DLL_LIB = xutil
 
+DLL_LIB = xutil xncbi
+
 WATCHERS = gouriano
 
 

diff --git a/c++/src/util/Makefile.util.lib b/c++/src/util/Makefile.util.lib
index a62a4d274b789c646757c2c5b5bf187107e7395a..9ddef4fb4399a5774dd26c7561f4e7dc78a5504e 100644 (file)
--- a/c++/src/util/Makefile.util.lib
+++ b/c++/src/util/Makefile.util.lib
@@ -15,6 +15,7 @@ SRC = random_gen utf8 checksum checksum_cityhash checksum_farmhash \
 LIB = xutil
 PROJ_TAG = core
 
+DLL_LIB = xncbi
 LIBS = $(ORIG_LIBS)
 
 WATCHERS = vakatov

diff --git a/c++/src/util/compress/api/Makefile.compress.lib b/c++/src/util/compress/api/Makefile.compress.lib
index fc4b03f921e22f62235c4e46c999c2e86752412d..06567ecbefc77cab85db967be00cc9df212dca77 100644 (file)
--- a/c++/src/util/compress/api/Makefile.compress.lib
+++ b/c++/src/util/compress/api/Makefile.compress.lib
@@ -7,7 +7,7 @@ LIB = xcompress
 
 CPPFLAGS = $(ORIG_CPPFLAGS) $(CMPRS_INCLUDE)
 
-DLL_LIB =  $(BZ2_LIB)  $(Z_LIB)  $(LZO_LIB)
+DLL_LIB =  $(BZ2_LIB)  $(Z_LIB)  $(LZO_LIB) xutil xncbi
 LIBS    =  $(BZ2_LIBS) $(Z_LIBS) $(LZO_LIBS) $(ORIG_LIBS)
 
 WATCHERS = ivanov

diff --git a/c++/src/util/sequtil/Makefile.sequtil.lib b/c++/src/util/sequtil/Makefile.sequtil.lib
index 2190e2898d56f04bf5de1b1f412634964ff4e4d1..0673acc4a81e7f7878e634307c5d2919b4d13bcb 100644 (file)
--- a/c++/src/util/sequtil/Makefile.sequtil.lib
+++ b/c++/src/util/sequtil/Makefile.sequtil.lib
@@ -3,6 +3,8 @@
 LIB = sequtil
 SRC = sequtil sequtil_convert sequtil_convert_imp sequtil_manip sequtil_tables sequtil_shared
 
+DLL_LIB = xncbi
+
 WATCHERS = grichenk ucko
 
 

diff --git a/c++/src/util/xregexp/Makefile.xregexp.lib b/c++/src/util/xregexp/Makefile.xregexp.lib
index b699c4579d6b64228455c231fbdb84204a48befb..4ed6f207c8ad545e7f2c3b3652188e3dae3712a9 100644 (file)
--- a/c++/src/util/xregexp/Makefile.xregexp.lib
+++ b/c++/src/util/xregexp/Makefile.xregexp.lib
@@ -5,7 +5,7 @@ LIB = xregexp
 
 CPPFLAGS = $(ORIG_CPPFLAGS) $(PCRE_INCLUDE)
 
-DLL_LIB = $(PCRE_LIB)
+DLL_LIB = $(PCRE_LIB) xncbi
 LIBS    = $(PCRE_LIBS)
 
 USES_LIBRARIES =  \

diff --git a/c++/src/util/xregexp/Makefile.xregexp_template_tester.lib b/c++/src/util/xregexp/Makefile.xregexp_template_tester.lib
index ad5779666aeb72046ae8cdbf430f5442583b452a..99b883bb13f5eab22f3bbc4c54b2b0539f000944 100644 (file)
--- a/c++/src/util/xregexp/Makefile.xregexp_template_tester.lib
+++ b/c++/src/util/xregexp/Makefile.xregexp_template_tester.lib
@@ -6,6 +6,8 @@ LIB = xregexp_template_tester
 DLL_LIB = $(PCRE_LIB)
 LIBS    = $(PCRE_LIBS)
 
+DLL_LIB = xregexp xncbi
+
 USES_LIBRARIES =  \
     xregexp $(PCRE_LIB) $(PCRE_LIBS) xncbi