diff options
author | 2013-05-16 14:03:24 +0100 | |
---|---|---|
committer | 2013-05-16 14:03:24 +0100 | |
commit | 4ddcda0f77caf2e3e8432596d3c202732c78d9a0 (patch) | |
tree | ba49a70bd394e505e9c83787d92ab42ee4d204ca | |
parent | 9dcd799fd4d4ffb5c5f4e2649d612939641ee1ce (diff) | |
download | paludis-4ddcda0f77caf2e3e8432596d3c202732c78d9a0.tar.gz paludis-4ddcda0f77caf2e3e8432596d3c202732c78d9a0.tar.xz |
Muck around with linkage
-rw-r--r-- | doc/api/python/Makefile.am | 2 | ||||
-rw-r--r-- | paludis/metadata_key.cc | 42 |
2 files changed, 22 insertions, 22 deletions
diff --git a/doc/api/python/Makefile.am b/doc/api/python/Makefile.am index 0aa134028..d78da95d4 100644 --- a/doc/api/python/Makefile.am +++ b/doc/api/python/Makefile.am @@ -30,7 +30,7 @@ python : $(top_builddir)/python/paludis.so epydoc.css python_syntax.css create_p `:`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/ruby/.libs/ \ `:`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/python/.libs/ \ `:`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/.libs/`" \ - PYTHONPATH="./.libs" \ + PYTHONPATH="$(top_builddir)/python/:$(top_builddir)/python/.libs/" \ epydoc --name Paludis -o python --url http://paludis.exherbo.org --no-frames --css $(srcdir)/epydoc.css \ $(top_builddir)/python/paludis.so $(PYTHON) $(srcdir)/create_python_examples.py $(srcdir) $(examples) diff --git a/paludis/metadata_key.cc b/paludis/metadata_key.cc index bb4478571..b66db7e4f 100644 --- a/paludis/metadata_key.cc +++ b/paludis/metadata_key.cc @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh + * Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012 Ciaran McCreesh * * This file is part of the Paludis package manager. Paludis is free software; * you can redistribute it and/or modify it under the terms of the GNU General @@ -69,29 +69,29 @@ MetadataSpecTreeKey<DependencySpecTree>::~MetadataSpecTreeKey() namespace paludis { - template class MetadataCollectionKey<KeywordNameSet>; - template class MetadataCollectionKey<Set<std::string> >; - template class MetadataCollectionKey<Sequence<std::string> >; - template class MetadataCollectionKey<Map<std::string, std::string> >; - template class MetadataCollectionKey<PackageIDSequence>; - template class MetadataCollectionKey<FSPathSequence>; - template class MetadataCollectionKey<Maintainers>; - - template class MetadataSpecTreeKey<LicenseSpecTree>; - template class MetadataSpecTreeKey<PlainTextSpecTree>; - template class MetadataSpecTreeKey<RequiredUseSpecTree>; + template class PALUDIS_VISIBLE MetadataCollectionKey<KeywordNameSet>; + template class PALUDIS_VISIBLE MetadataCollectionKey<Set<std::string> >; + template class PALUDIS_VISIBLE MetadataCollectionKey<Sequence<std::string> >; + template class PALUDIS_VISIBLE MetadataCollectionKey<Map<std::string, std::string> >; + template class PALUDIS_VISIBLE MetadataCollectionKey<PackageIDSequence>; + template class PALUDIS_VISIBLE MetadataCollectionKey<FSPathSequence>; + template class PALUDIS_VISIBLE MetadataCollectionKey<Maintainers>; + + template class PALUDIS_VISIBLE MetadataSpecTreeKey<LicenseSpecTree>; + template class PALUDIS_VISIBLE MetadataSpecTreeKey<PlainTextSpecTree>; + template class PALUDIS_VISIBLE MetadataSpecTreeKey<RequiredUseSpecTree>; #ifndef PALUDIS_NO_EXPLICIT_FULLY_SPECIALISED template class MetadataSpecTreeKey<FetchableURISpecTree>; template class MetadataSpecTreeKey<DependencySpecTree>; #endif - template class MetadataSpecTreeKey<SimpleURISpecTree>; - - template class MetadataValueKey<std::string>; - template class MetadataValueKey<long>; - template class MetadataValueKey<bool>; - template class MetadataValueKey<FSPath>; - template class MetadataValueKey<Slot>; - template class MetadataValueKey<std::shared_ptr<const PackageID> >; - template class MetadataValueKey<std::shared_ptr<const Choices> >; + template class PALUDIS_VISIBLE MetadataSpecTreeKey<SimpleURISpecTree>; + + template class PALUDIS_VISIBLE MetadataValueKey<std::string>; + template class PALUDIS_VISIBLE MetadataValueKey<long>; + template class PALUDIS_VISIBLE MetadataValueKey<bool>; + template class PALUDIS_VISIBLE MetadataValueKey<FSPath>; + template class PALUDIS_VISIBLE MetadataValueKey<Slot>; + template class PALUDIS_VISIBLE MetadataValueKey<std::shared_ptr<const PackageID> >; + template class PALUDIS_VISIBLE MetadataValueKey<std::shared_ptr<const Choices> >; } |