remove some deprected stuff

diff --git a/Makefile b/Makefile
index 5e9510c444aeb50529cbd40c399808fe896add4c..5809c575cb5d2adfb53dd344afbaf0cd909bb646 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,7 @@ ifeq ($(DEP_TRACKING),true)
 COMPILE                = ./tools/compile.lua
 endif
 
-ifeq ($(AS_NEEDED),true)
+ifeq ($(DEP_MINIMIZING),true)
 LINK           = ./tools/link.lua
 endif
 

diff --git a/configure b/configure
index 7a4adbf4997b3d1258e56bd068ef429e011d4859..bea16f44f4ce2eb12e3ce0b0482f262bb05aac23 100755 (executable)
--- a/configure
+++ b/configure
@@ -50,16 +50,16 @@ Basic configuration:
       --datadir=DIR       directory to install shared data files
       --mandir=DIR        directory to install manual pages
 
-      --disable-dependency-tracking  speed up one-time builds
-      --enable-asneeded   decrease the number of direct dependencies
+      --disable-dependency-tracking  speed up one-time builds (maybe)
+      --disable-special-linking      do not use direct dependency minimizer
+      --enable-profile    compile in gprof profiling instructions
 
 Program options:
-      --enable-debug      include debugging symbols and code paths
-      --enable-double-precision      use doubles instead of floats
-      --enable-profile    compile in gprof profiling instructions
-      --enable-clock_gettime         use clock_gettime() for timing
-      --enable-threads    use threads for concurrency
-      --enable-hotloading watch assets for automatic reloading
+      --enable-clock_gettime         use a very accurate timing function
+      --enable-debug      compile in assertion checks and other debug helps
+      --enable-double-precision      use larger floating-point numbers
+      --enable-hotloading watch assets and automatically reload them
+      --enable-threads    use threads for concurrency where appropriate
 
       --with-gtk          use the gtk2 toolkit (overrides --with-qt4)
       --with-qt4          use the qt4 gui toolkit
@@ -338,10 +338,14 @@ do
        define("mandir",                datarootdir.."/man")
        define("docdir",                datarootdir.."/doc/"..tarname)
 
-       if not features["dependency-tracking"] then
+       if features["dependency-tracking"] == nil then
                features["dependency-tracking"] = true
        end
        
+       if features["special-linking"] == nil then
+               features["special-linking"] = true
+       end
+       
        define("config",                {})
        define("define",                {})
        define("export",                {})
@@ -462,20 +466,12 @@ else
        config.NDEBUG = true
 end
 
-if get_feature("extra-warnings") then
-       add_cflag("-Wextra -Wno-unused-parameter")
-end
-
 config.USE_CLOCK_GETTIME       = get_feature("clock_gettime")
 config.USE_DOUBLE_PRECISION    = get_feature("double-precision")
 config.USE_HOTLOADING          = get_feature("hotloading")
 config.USE_THREADS                     = get_feature("threads")
 config.PROFILING_ENABLED       = get_feature("profile") and add_cflag("-pg")
 
-if get_feature("asneeded") then
-       define.AS_NEEDED = true
-end
-
 if get_package("gtk") then
        -- TODO
 end
@@ -552,6 +548,7 @@ define.datadir                              = datadir
 define.mandir                          = mandir
 define.EXEEXT                          = exe_extension
 define.DEP_TRACKING                    = get_feature("dependency-tracking")
+define.DEP_MINIMIZING          = get_feature("special-linking")
 
 export.datadir                         = datadir               -- Used in doc/yoink.6.in.
 export.PACKAGE_BUGREPORT       = contact               -- Used in doc/yoink.6.in.

diff --git a/src/moof/resource.cc b/src/moof/resource.cc
index c57b527fe706e8de09e61b67ca7e81cac48b9ee0..57bd99b927df9fabfdee70f22faeae208c2d823b 100644 (file)
--- a/src/moof/resource.cc
+++ b/src/moof/resource.cc
@@ -222,15 +222,6 @@ void resource::add_search_paths(const std::string& paths)
 }
 
 
-bool resource::find(const std::string& path)
-{
-       //std::string file = stlplus::lookup(path, search_paths_, ":");
-       //log_info("found file", file, "in", search_paths_);
-       //return !stlplus::lookup(path, search_paths_, ":").empty();
-       return find_file(path) != "";
-}
-
-
 std::string resource::find_file(const std::string& name)
 {
        std::vector<std::string> paths;
@@ -278,11 +269,6 @@ std::string resource::find_file(const std::string& name,
        return find_file(name);
 }
 
-FILE* resource::open_file(const std::string& path, const std::string& mode)
-{
-       return fopen(find_file(path).c_str(), mode.c_str());
-}
-
 
 } // namespace moof
 

diff --git a/src/moof/resource.hh b/src/moof/resource.hh
index eba4b3f2871d59e55a81b661e98776a947b97183..9d991053c21b841be3ebc164e6b538244c80bb82 100644 (file)
--- a/src/moof/resource.hh
+++ b/src/moof/resource.hh
@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include <cstdio>
 #include <map>
 #include <stdexcept>
 #include <string>
@@ -62,28 +61,12 @@ public:
         * \param path The name of the resource to find.  Upon successful
         * return, this is changed to an absolute path to the resource.
         * \return True if a path to a resource was found, false otherwise.
-        * XXX this is legacy
         */
-       static bool find(const std::string& file);
-
        static std::string find_file(const std::string& name);
 
        static std::string find_file(const std::string& name,
                                                                 const std::string& ext);
 
-       /**
-        * Get the path to a resource of a given name and open it if a resource
-        * was found.
-        * \param path The name of the resource to find.  Upon successful
-        * return, this is changed to an absolute path to the resource.
-        * \param mode The open mode.
-        * \return The FILE* if the resource was found, 0 otherwise.
-        * XXX deprecated
-        */
-       static FILE* open_file(const std::string& path,
-                                                  const std::string& mode = "rb");
-
-
        /**
         * Register a type with the extension of files which this type can
         * load.  If any type has already been registered with the given file
@@ -95,7 +78,6 @@ public:
                                                          const std::string& prefix = "")
        {
                loader_ptr loader(new specific_loader<T>(prefix));
-               printf("registered type with prefix %s", loader->prefix().c_str());
                call_registry(extension, loader, set);
        }