X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=SConstruct;h=a190dcc227959508a88795e743fbeeaf43e35759;hb=e7ac3fef18af5ec0076f02290ad439a9d6e05491;hp=66cfbb40733a4081f81fa356de210e4e1589bbe1;hpb=51044eb18f034c1a059ffe2fb109a422c1cbe251;p=senf.git

diff --git a/SConstruct b/SConstruct
index 66cfbb4..a190dcc 100644
--- a/SConstruct
+++ b/SConstruct
@@ -140,16 +140,21 @@ env.Append(
          },
    LOCAL_CONFIG_FILES = [ 'Doxyfile.local', 'SConfig', 'local_config.hh' ],
    CONFIG_FILES_OPTS = configFilesOpts,
-   CLEAN_PATTERNS = [ '*.pyc', 'semantic.cache', '.sconsign', '.sconsign.dblite' ],
-   BUILDPACKAGE_COMMAND = "dpkg-buildpackage -us -uc -rfakeroot -I.svn $CONFIG_FILES_OPTS",
+   CLEAN_PATTERNS = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign', '.sconsign.dblite' ],
+   BUILDPACKAGE_COMMAND = "dpkg-buildpackage -us -uc -rfakeroot -I.svn -I_templates $CONFIG_FILES_OPTS",
    TOP_INCLUDES = [ 'Packets', 'PPI', 'Scheduler', 'Socket', 'Utils',
-                    'config.hh', 'local_config.hh' ]
+                    'config.hh', 'local_config.hh' ],
+)
+
+env.SetDefault(
+       LIBSENF = "senf"
 )
 
 Export('env')
 
 # Create Doxyfile.local otherwise doxygen will barf on this non-existent file
-if not env.GetOption('clean') and not os.path.exists("Doxyfile.local"):
+# Create it even when cleaning, to silence the doxygen builder warnings
+if not os.path.exists("Doxyfile.local"):
     Execute(Touch("Doxyfile.local"))
 
 # Create local_config.h
@@ -187,18 +192,18 @@ SENFSCons.StandardTargets(env)
 SENFSCons.GlobalTargets(env)
 SENFSCons.Doxygen(env)
 SENFSCons.DoxyXRef(env,
-                   HTML_HEADER = '#/doclib/doxy-header-overview.html',
+                   HTML_HEADER = '#/doclib/doxy-header.html',
                    HTML_FOOTER = '#/doclib/doxy-footer.html')
 
 SENFSCons.InstallIncludeFiles(env, [ 'config.hh' ])
 
 # Build combined library 'libsenf'
 libsenf = env.Library(
-    SENFSCons.LibPath('senf'),
+    'senf${LIBADDSUFFIX}',
     Flatten([ env.File(SENFSCons.LibPath(lib)).sources for lib in env['ALLLIBS'] ]))
 env.Default(libsenf)
-env.Clean('all', 'libsenf.a')
-env.Alias('default', 'libsenf.a')
+env.Clean('all', libsenf)
+env.Alias('default', libsenf)
 
 env.Alias('install_all', env.Install('$LIBINSTALLDIR', libsenf))
 
@@ -210,7 +215,7 @@ env.Clean('all', [ os.path.join(path,f)
 PhonyTarget(env, 'deb', [
     checkLocalConf,
     updateRevision,
-    "$BUILDPACKAGE_COMMAND",
+    "$BUILDPACKAGE_COMMAND -tc",
 ])
 
 PhonyTarget(env, 'debsrc', [
@@ -221,7 +226,8 @@ PhonyTarget(env, 'debsrc', [
 PhonyTarget(env, 'debbin', [
     checkLocalConf,
     updateRevision,
-    "$BUILDPACKAGE_COMMAND -nc",
+    "$BUILDPACKAGE_COMMAND -b",
+    "fakeroot ./debian/rules debclean"
 ])
 
 PhonyTarget(env, 'linklint', [