Fix 'scons clean' dependencies

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
 

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:

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 = '.'
 

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: