X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstaticlibrary.h;h=98d299026bc366aed45ab21568530b02e82b84f2;hb=f0c0d720edc01f5faa72bb4ff4bf655445842678;hp=451e9f8aedc5b23a35d6308738aa6d9c9fd8aadc;hpb=6026d07fec5132c04fa94d61cef2fd59cffeb4b8;p=builder.git

diff --git a/source/staticlibrary.h b/source/staticlibrary.h
index 451e9f8..98d2990 100644
--- a/source/staticlibrary.h
+++ b/source/staticlibrary.h
@@ -11,13 +11,24 @@ A static library target.
 */
 class StaticLibrary: public FileTarget
 {
-public:
-	StaticLibrary(Builder &, const Msp::FS::Path &);
-	StaticLibrary(Builder &, const Component &, const std::list<ObjectFile *> &);
+private:
+	/* TODO this really belongs in a Component, but some refactoring is required
+	to allow non-builder packages to have components.  Rename BinaryPackage to
+	ExternalPackage, add BuildableComponent and ExternalComponent classes. */
+	BuildInfo build_info;
 
-	virtual const char *get_type() const { return "StaticLibrary"; }
+public:
+	StaticLibrary(Builder &b, const Msp::FS::Path &p): FileTarget(b, p) { }
+	StaticLibrary(Builder &, const Component &, const std::vector<ObjectFile *> &);
 private:
 	static std::string generate_filename(const Component &);
+
+public:
+	const char *get_type() const override { return "StaticLibrary"; }
+
+	void add_required_library(const std::string &);
+	void add_library_path(const Msp::FS::Path &);
+	void collect_build_info(BuildInfo &) const override;
 };
 
 #endif