Fix 'scons clean' dependencies

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@444 270642c3-0616-0410-b53a-bc976706d245

diff --git a/debian/control b/debian/control
index 3f753f8..270def1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: extra
 Maintainer: Stefan Bund <senf-dev@lists.berlios.de>
 Build-Depends: debhelper (>= 5), scons, binutils-dev, libboost-dev, 
        libboost-test-dev, libboost-date-time-dev, libboost-regex-dev, 
-       doxygen, dia, tidy, xsltproc, graphviz, perl-base
+       doxygen, dia, tidy, xsltproc, graphviz, perl-base, linklint
 Standards-Version: 3.7.2
 Section: libs
 

diff --git a/debian/rules b/debian/rules
index 6acb1d9..f1921e0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -52,6 +52,8 @@ build-stamp: configure-stamp
        dh_testdir
 #      # Add here commands to compile the package.
        scons -j $(CONCURRENCY_LEVEL) default all_docs final=1
+       scons linklint
+       scons fixlinks
        touch $@
 
 clean:

diff --git a/senfscons/Doxygen.py b/senfscons/Doxygen.py
index e5b7b79..e9d8661 100644 (file)
--- a/senfscons/Doxygen.py
+++ b/senfscons/Doxygen.py
@@ -343,7 +343,9 @@ def DoxyEmitter(source, target, env):
       out_dir = data["OUTPUT_DIRECTORY"]
       dir = env.Dir( os.path.join(source[0].dir.abspath, out_dir) )
       dir.sources = source
-      if env.GetOption('clean'): targets.append(dir)
+      if env.GetOption('clean'):
+         targets.append(dir)
+         return (targets, source)
    else:
       out_dir = '.'
 

diff --git a/senfscons/SENFSCons.py b/senfscons/SENFSCons.py
index d2a170a..753f692 100644 (file)
--- a/senfscons/SENFSCons.py
+++ b/senfscons/SENFSCons.py
@@ -350,6 +350,9 @@ def Objects(env, sources, testSources = None, LIBS = [], OBJECTS = []):
     return objects
 
 def InstallIncludeFiles(env, files):
+    # Hrmpf ... why do I need this in 0.97??
+    if env.GetOption('clean'):
+        return
     target = env.Dir(env['INCLUDEINSTALLDIR'])
     base = env.Dir(env['INSTALL_BASE'])
     for f in files: