From 2861a8a63351f8f87e64c13e2e6dd44809b57eb8 Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Mon, 24 Feb 2014 03:27:10 +0000
Subject: [PATCH] [SCons] Simplify treatment of sydep1.h and signal1.h

We don't actually have system-dependent versions of these headers, so just put
the templates in place directly. This is also a workaround for a SCons bug on
Cygwin.

Cherry-pick of trunk r2735.
---
 SConstruct                             | 2 --
 ext/SConscript                         | 8 --------
 ext/f2c_libs/.gitignore                | 2 --
 ext/f2c_libs/{signal1.h0 => signal1.h} | 0
 ext/f2c_libs/{sysdep1.h0 => sysdep1.h} | 0
 5 files changed, 12 deletions(-)
 rename ext/f2c_libs/{signal1.h0 => signal1.h} (100%)
 rename ext/f2c_libs/{sysdep1.h0 => sysdep1.h} (100%)

diff --git a/SConstruct b/SConstruct
index 5d8647333..8d9c6b482 100644
--- a/SConstruct
+++ b/SConstruct
@@ -52,8 +52,6 @@ if 'clean' in COMMAND_LINE_TARGETS:
     removeFile('include/cantera/base/config.h')
     removeFile('interfaces/python/setup.py')
     removeFile('ext/f2c_libs/arith.h')
-    removeFile('ext/f2c_libs/signal1.h')
-    removeFile('ext/f2c_libs/sysdep1.h')
     for name in os.listdir('.'):
         if name.endswith('.msi'):
             removeFile(name)
diff --git a/ext/SConscript b/ext/SConscript
index 45916f9d7..661a0abca 100644
--- a/ext/SConscript
+++ b/ext/SConscript
@@ -81,14 +81,6 @@ if env['build_with_f2c']:
         arithenv.Command('#ext/f2c_libs/arith.h', 'f2c_libs/arithchk/arithchk$PROGSUFFIX',
                          '$SOURCE > $TARGET')
 
-    headerenv = prep_f2c(env)
-    # Possibly system-dependent headers
-    headerenv.Command('#ext/f2c_libs/signal1.h', 'f2c_libs/signal1.h0',
-                      Copy('$TARGET', '$SOURCE'))
-
-    headerenv.Command('#ext/f2c_libs/sysdep1.h', 'f2c_libs/sysdep1.h0',
-                      Copy('$TARGET', '$SOURCE'))
-
     libs.append(('f2c_libs', 'c', prep_f2c))
 
     if env['BUILD_BLAS_LAPACK']:
diff --git a/ext/f2c_libs/.gitignore b/ext/f2c_libs/.gitignore
index be02f378b..4ed511628 100644
--- a/ext/f2c_libs/.gitignore
+++ b/ext/f2c_libs/.gitignore
@@ -1,3 +1 @@
 arith.h
-signal1.h
-sysdep1.h
diff --git a/ext/f2c_libs/signal1.h0 b/ext/f2c_libs/signal1.h
similarity index 100%
rename from ext/f2c_libs/signal1.h0
rename to ext/f2c_libs/signal1.h
diff --git a/ext/f2c_libs/sysdep1.h0 b/ext/f2c_libs/sysdep1.h
similarity index 100%
rename from ext/f2c_libs/sysdep1.h0
rename to ext/f2c_libs/sysdep1.h