Change component order so that miscellaneous installed files get in tarball

[builder.git] / source / component.h

diff --git a/source/component.h b/source/component.h
index ce4a821c822e5d6dcf99485fed93e0ee51e42c58..3a358ce04f36b0770cea5251997d62d6d0ae2b8f 100644 (file)
--- a/source/component.h
+++ b/source/component.h
@@ -30,24 +30,30 @@ public:
        {
        private:
                Component ∁
+               std::string inst_hdr;
 
        public:
                Loader(Component &);
                Component &get_object() { return comp; }
        private:
+               virtual void finish();
                void source(const std::string &);
                void require(const std::string &);
                void modular();
                void host(const std::string &);
+               void install_headers(const std::string &);
                void build_info();
        };
 
        enum Type
        {
-               PROGRAM,
+               HEADERS,
                LIBRARY,
+               PROGRAM,
                MODULE,
-               HEADERS
+               DATAFILE,
+               INSTALL,
+               TARBALL
        };
 
 protected:
@@ -56,7 +62,6 @@ protected:
        std::string name;
        PathList sources;
        bool install;
-       std::string install_headers;
        const Component *module_host;
        bool modular;
        BuildInfo build_info;
@@ -71,10 +76,9 @@ public:
        const PathList &get_sources() const { return sources; }
        const BuildInfo &get_build_info() const { return build_info; }
        bool get_install() const { return install; }
-       const std::string &get_install_headers() const { return install_headers; }
-       bool get_modular() const { return modular; }
+       bool is_modular() const { return modular; }
        const PackageList &get_requires() const { return requires; }
-       bool get_default() const { return deflt; }
+       bool is_default() const { return deflt; }
 
        /** Prepares the build information for building.  Pulls build info from the
        parent and dependency packages, and adds any component-specific flags. */