From 9c4201a171b0f19bb42fad52cf68c9e09463c122 Mon Sep 17 00:00:00 2001
From: g0dil <g0dil@wiback.org>
Date: Thu, 13 Sep 2007 16:19:38 +0000
Subject: [PATCH] Fix 'scons clean' dependencies
---
debian/control | 2 +-
debian/rules | 2 ++
senfscons/Doxygen.py | 4 +++-
senfscons/SENFSCons.py | 3 +++
4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 3f753f877..270def168 100644
--- 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 6acb1d995..f1921e032 100755
--- 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 e5b7b79d2..e9d866137 100644
--- 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 d2a170a4d..753f6921e 100644
--- 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:
--
GitLab