octave-nkf: src/mkoctfile.in.cc annotate

annotate src/mkoctfile.in.cc @ 15946:25eff7fe556d

maint: periodic merge of stable to default

author	John W. Eaton <jwe@octave.org>
date	Mon, 14 Jan 2013 16:05:47 -0500
parents	src/mkoctfile.cc.in@a653526ea4a5 src/mkoctfile.cc.in@4803b8c138e3
children	96d02808a881

rev	line source
8920 eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8332 diff changeset	1 /*
eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8332 diff changeset	2
14138 72c96de7a403 maint: update copyright notices for 2012 John W. Eaton <jwe@octave.org> parents: 13130 diff changeset	3 Copyright (C) 2008-2012 Michael Goffioul
8920 eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8332 diff changeset	4
eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8332 diff changeset	5 This file is part of Octave.
eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8332 diff changeset	6
eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8332 diff changeset	7 Octave is free software; you can redistribute it and/or modify it
eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8332 diff changeset	8 under the terms of the GNU General Public License as published by the
eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8332 diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8332 diff changeset	10 option) any later version.
eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8332 diff changeset	11
eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8332 diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8332 diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8332 diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8332 diff changeset	15 for more details.
eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8332 diff changeset	16
eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8332 diff changeset	17 You should have received a copy of the GNU General Public License
eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8332 diff changeset	18 along with Octave; see the file COPYING. If not, see
eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8332 diff changeset	19 <http://www.gnu.org/licenses/>.
eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8332 diff changeset	20
eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8332 diff changeset	21 */
eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8332 diff changeset	22
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	23 #if defined (HAVE_CONFIG_H)
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	24 #include <config.h>
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	25 #endif
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	26
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	27 #include <string>
15299 8bd5c490b787 Fix mex compilation with subdirs on Windows platforms (bug #37122) Rik <rik@octave.org> parents: 15271 diff changeset	28 #include <cstring>
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	29 #include <map>
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	30 #include <list>
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	31 #include <algorithm>
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	32 #include <iostream>
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	33 #include <fstream>
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	34 #include <vector>
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	35 #include <cstdlib>
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	36
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	37 #if defined (__WIN32__) && ! defined (_POSIX_VERSION)
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	38 #include <windows.h>
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	39 #ifdef _MSC_VER
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	40 #define popen _popen
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	41 #define pclose _pclose
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	42 #endif
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	43 #endif
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	44
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	45 using namespace std;
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	46
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	47 static bool initialized = false;
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	48 static map<string,string> vars;
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	49
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	50 static string OCTAVE_VERSION = %OCTAVE_CONF_VERSION%;
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	51
15309 c398dde4d409 mkoctfile.in.cc: Remove unneeded "std::" namespace decorators Rik <rik@octave.org> parents: 15299 diff changeset	52 static string
c398dde4d409 mkoctfile.in.cc: Remove unneeded "std::" namespace decorators Rik <rik@octave.org> parents: 15299 diff changeset	53 substitute_prefix (const string& s, const string& prefix,
c398dde4d409 mkoctfile.in.cc: Remove unneeded "std::" namespace decorators Rik <rik@octave.org> parents: 15299 diff changeset	54 const string& new_prefix)
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	55 {
15309 c398dde4d409 mkoctfile.in.cc: Remove unneeded "std::" namespace decorators Rik <rik@octave.org> parents: 15299 diff changeset	56 string retval = s;
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	57
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	58 if (!prefix.empty () && new_prefix != prefix)
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	59 {
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	60 int len = prefix.length ();
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	61 if (retval.find (prefix) == 0)
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	62 retval.replace (0, len, new_prefix);
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	63 }
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	64
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	65 #if defined (__WIN32__) && ! defined (_POSIX_VERSION)
15309 c398dde4d409 mkoctfile.in.cc: Remove unneeded "std::" namespace decorators Rik <rik@octave.org> parents: 15299 diff changeset	66 replace (retval.begin (), retval.end (), '/', '\\');
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	67 #endif
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	68
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	69 return retval;
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	70 }
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	71
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	72 static string
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	73 get_line (FILE *fp)
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	74 {
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	75 static vector<char> buf (100);
15458 1cc42df8ede7 mkoctfile.in.cc: Change variable types to stop compilation warnings. Rik <rik@octave.org> parents: 15309 diff changeset	76 unsigned int idx = 0;
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	77 char c;
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	78
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	79 while (true)
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	80 {
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	81 c = static_cast<char> (fgetc (fp));
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	82 if (c == '\n' \|\| c == EOF)
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	83 break;
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	84 if (buf.size () <= idx)
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	85 buf.resize (buf.size () + 100);
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	86 buf[idx++] = c;
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	87 }
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	88 if (idx == 0)
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	89 return string ("");
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	90 else
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	91 return string (&buf[0], idx);
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	92 }
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	93
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	94
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	95 static string
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	96 get_variable (const char *name, const string& defval)
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	97 {
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	98 const char *val = getenv (name);
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	99 if (val == NULL \|\| val[0] == '\0')
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	100 return defval;
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	101 else
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	102 return string (val);
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	103 }
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	104
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	105 static string
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	106 quote_path (const string& s)
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	107 {
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	108 if (s.find (' ') != string::npos && s[0] != '"')
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	109 return "\"" + s + "\"";
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	110 else
34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	111 return s;
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	112 }
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	113
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	114 static void
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	115 initialize (void)
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	116 {
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	117 if (initialized)
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	118 return;
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	119
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	120 initialized = true;
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	121
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	122 vars["OCTAVE_HOME"] = get_variable ("OCTAVE_HOME", "");
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	123
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	124 #if defined (__WIN32__) && ! defined (_POSIX_VERSION)
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	125 int n = 1024;
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	126
15309 c398dde4d409 mkoctfile.in.cc: Remove unneeded "std::" namespace decorators Rik <rik@octave.org> parents: 15299 diff changeset	127 string bin_dir (n, '\0');
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	128
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	129 while (true)
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	130 {
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	131 int status = GetModuleFileName (0, &bin_dir[0], n);
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	132
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	133 if (status < n)
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	134 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	135 bin_dir.resize (status);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	136 break;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	137 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	138 else
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	139 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	140 n *= 2;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	141 bin_dir.resize (n);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	142 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	143 }
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	144
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	145 if (! bin_dir.empty ())
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	146 {
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	147 size_t pos = bin_dir.rfind ("\\bin\\");
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	148
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	149 if (pos != string::npos)
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	150 vars["OCTAVE_HOME"] = bin_dir.substr (0, pos);
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	151 }
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	152 #endif
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	153
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	154 vars["SED"] = get_variable ("SED", %OCTAVE_CONF_SED%);
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	155
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	156 vars["OCTAVE_PREFIX"] = %OCTAVE_CONF_PREFIX%;
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	157
15309 c398dde4d409 mkoctfile.in.cc: Remove unneeded "std::" namespace decorators Rik <rik@octave.org> parents: 15299 diff changeset	158 string DEFAULT_OCTINCLUDEDIR = %OCTAVE_CONF_OCTINCLUDEDIR%;
c398dde4d409 mkoctfile.in.cc: Remove unneeded "std::" namespace decorators Rik <rik@octave.org> parents: 15299 diff changeset	159 string DEFAULT_INCLUDEDIR = %OCTAVE_CONF_INCLUDEDIR%;
c398dde4d409 mkoctfile.in.cc: Remove unneeded "std::" namespace decorators Rik <rik@octave.org> parents: 15299 diff changeset	160 string DEFAULT_LIBDIR = %OCTAVE_CONF_LIBDIR%;
c398dde4d409 mkoctfile.in.cc: Remove unneeded "std::" namespace decorators Rik <rik@octave.org> parents: 15299 diff changeset	161 string DEFAULT_OCTLIBDIR = %OCTAVE_CONF_OCTLIBDIR%;
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	162
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	163 if (! vars["OCTAVE_HOME"].empty ())
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	164 {
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	165 DEFAULT_OCTINCLUDEDIR
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	166 = substitute_prefix (DEFAULT_OCTINCLUDEDIR, vars["OCTAVE_PREFIX"],
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	167 vars["OCTAVE_HOME"]);
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	168
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	169 DEFAULT_INCLUDEDIR
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	170 = substitute_prefix (DEFAULT_INCLUDEDIR, vars["OCTAVE_PREFIX"],
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	171 vars["OCTAVE_HOME"]);
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	172
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	173 DEFAULT_LIBDIR
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	174 = substitute_prefix (DEFAULT_LIBDIR, vars["OCTAVE_PREFIX"],
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	175 vars["OCTAVE_HOME"]);
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	176
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	177 DEFAULT_OCTLIBDIR
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	178 = substitute_prefix (DEFAULT_OCTLIBDIR, vars["OCTAVE_PREFIX"],
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	179 vars["OCTAVE_HOME"]);
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	180 }
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	181
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	182 vars["OCTINCLUDEDIR"] = get_variable ("OCTINCLUDEDIR", DEFAULT_OCTINCLUDEDIR);
34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	183 vars["INCLUDEDIR"] = get_variable ("INCLUDEDIR", DEFAULT_INCLUDEDIR);
34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	184 vars["LIBDIR"] = get_variable ("LIBDIR", DEFAULT_LIBDIR);
34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	185 vars["OCTLIBDIR"] = get_variable ("OCTLIBDIR", DEFAULT_OCTLIBDIR);
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	186
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	187 #if defined (__WIN32__) && ! defined (_POSIX_VERSION)
15309 c398dde4d409 mkoctfile.in.cc: Remove unneeded "std::" namespace decorators Rik <rik@octave.org> parents: 15299 diff changeset	188 string DEFAULT_INCFLAGS
9794 0d4613a736e9 convert build system to use automake and libtool John W. Eaton <jwe@octave.org> parents: 9565 diff changeset	189 = "-I" + quote_path (vars["OCTINCLUDEDIR"] + "\\..")
0d4613a736e9 convert build system to use automake and libtool John W. Eaton <jwe@octave.org> parents: 9565 diff changeset	190 + " -I" + quote_path (vars["OCTINCLUDEDIR"]);
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	191 #else
15309 c398dde4d409 mkoctfile.in.cc: Remove unneeded "std::" namespace decorators Rik <rik@octave.org> parents: 15299 diff changeset	192 string DEFAULT_INCFLAGS
9794 0d4613a736e9 convert build system to use automake and libtool John W. Eaton <jwe@octave.org> parents: 9565 diff changeset	193 = "-I" + quote_path (vars["OCTINCLUDEDIR"] + "/..")
0d4613a736e9 convert build system to use automake and libtool John W. Eaton <jwe@octave.org> parents: 9565 diff changeset	194 + " -I" + quote_path (vars["OCTINCLUDEDIR"]);
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	195 #endif
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	196 if (vars["INCLUDEDIR"] != "/usr/include")
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	197 DEFAULT_INCFLAGS += " -I" + quote_path (vars["INCLUDEDIR"]);
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	198
15309 c398dde4d409 mkoctfile.in.cc: Remove unneeded "std::" namespace decorators Rik <rik@octave.org> parents: 15299 diff changeset	199 string DEFAULT_LFLAGS = "-L" + quote_path (vars["OCTLIBDIR"]);
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	200 if (vars["LIBDIR"] != "/usr/lib")
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	201 DEFAULT_LFLAGS += " -L" + quote_path (vars["LIBDIR"]);
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	202
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	203 vars["CPPFLAGS"] = get_variable ("CPPFLAGS", %OCTAVE_CONF_CPPFLAGS%);
34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	204 vars["INCFLAGS"] = get_variable ("INCFLAGS", DEFAULT_INCFLAGS);
15929 16418ff39a72 strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile John W. Eaton <jwe@octave.org> parents: 15458 diff changeset	205 vars["F77"] = get_variable ("F77", %OCTAVE_CONF_MKOCTFILE_F77%);
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	206 vars["FFLAGS"] = get_variable ("FFLAGS", %OCTAVE_CONF_FFLAGS%);
34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	207 vars["FPICFLAG"] = get_variable ("FPICFLAG", %OCTAVE_CONF_FPICFLAG%);
15929 16418ff39a72 strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile John W. Eaton <jwe@octave.org> parents: 15458 diff changeset	208 vars["CC"] = get_variable ("CC", %OCTAVE_CONF_MKOCTFILE_CC%);
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	209 vars["CFLAGS"] = get_variable ("CFLAGS", %OCTAVE_CONF_CFLAGS%);
34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	210 vars["CPICFLAG"] = get_variable ("CPICFLAG", %OCTAVE_CONF_CPICFLAG%);
15929 16418ff39a72 strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile John W. Eaton <jwe@octave.org> parents: 15458 diff changeset	211 vars["CXX"] = get_variable ("CXX", %OCTAVE_CONF_MKOCTFILE_CXX%);
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	212 vars["CXXFLAGS"] = get_variable ("CXXFLAGS", %OCTAVE_CONF_CXXFLAGS%);
34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	213 vars["CXXPICFLAG"] = get_variable ("CXXPICFLAG", %OCTAVE_CONF_CXXPICFLAG%);
34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	214 vars["XTRA_CFLAGS"] = get_variable ("XTRA_CFLAGS", %OCTAVE_CONF_XTRA_CFLAGS%);
34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	215 vars["XTRA_CXXFLAGS"] = get_variable ("XTRA_CXXFLAGS", %OCTAVE_CONF_XTRA_CXXFLAGS%);
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	216
15944 4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	217 vars["AR"] = get_variable ("AR", %OCTAVE_CONF_MKOCTFILE_AR%);
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	218 vars["RANLIB"] = get_variable ("RANLIB", %OCTAVE_CONF_MKOCTFILE_RANLIB%);
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	219
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	220 vars["DEPEND_FLAGS"] = get_variable ("DEPEND_FLAGS", %OCTAVE_CONF_DEPEND_FLAGS%);
34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	221 vars["DEPEND_EXTRA_SED_PATTERN"] = get_variable ("DEPEND_EXTRA_SED_PATTERN", %OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%);
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	222
15929 16418ff39a72 strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile John W. Eaton <jwe@octave.org> parents: 15458 diff changeset	223 vars["DL_LD"] = get_variable ("DL_LD", %OCTAVE_CONF_MKOCTFILE_DL_LD%);
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	224 vars["DL_LDFLAGS"] = get_variable ("DL_LDFLAGS", %OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%);
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	225
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	226 vars["RDYNAMIC_FLAG"] = get_variable ("RDYNAMIC_FLAG", %OCTAVE_CONF_RDYNAMIC_FLAG%);
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	227 vars["LIBOCTAVE"] = "-loctave";
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	228 vars["LIBOCTINTERP"] = "-loctinterp";
9515 eee9b3150446 more configure tweaks John W. Eaton <jwe@octave.org> parents: 9303 diff changeset	229 vars["READLINE_LIBS"] = "-lreadline";
11450 5eb10763069f substitute and use LAPACK_LIBS in mkoctfile script John W. Eaton <jwe@octave.org> parents: 11251 diff changeset	230 vars["LAPACK_LIBS"] = get_variable ("LAPACK_LIBS", %OCTAVE_CONF_LAPACK_LIBS%);
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	231 vars["BLAS_LIBS"] = get_variable ("BLAS_LIBS", %OCTAVE_CONF_BLAS_LIBS%);
9538 d0239bddf621 use OCTAVE_CHECK_LIB to check for zlib John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	232 vars["FFTW3_LDFLAGS"] = get_variable ("FFTW3_LDFLAGS", %OCTAVE_CONF_FFTW3_LDFLAGS%);
d0239bddf621 use OCTAVE_CHECK_LIB to check for zlib John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	233 vars["FFTW3_LIBS"] = get_variable ("FFTW3_LIBS", %OCTAVE_CONF_FFTW3_LIBS%);
d0239bddf621 use OCTAVE_CHECK_LIB to check for zlib John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	234 vars["FFTW3F_LDFLAGS"] = get_variable ("FFTW3F_LDFLAGS", %OCTAVE_CONF_FFTW3F_LDFLAGS%);
d0239bddf621 use OCTAVE_CHECK_LIB to check for zlib John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	235 vars["FFTW3F_LIBS"] = get_variable ("FFTW3F_LIBS", %OCTAVE_CONF_FFTW3F_LIBS%);
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	236 vars["LIBS"] = get_variable ("LIBS", %OCTAVE_CONF_LIBS%);
34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	237 vars["FLIBS"] = get_variable ("FLIBS", %OCTAVE_CONF_FLIBS%);
13010 edc5ec6e949b maint: allow --enable-static --disable-dl to work again John W. Eaton <jwe@octave.org> parents: 12733 diff changeset	238 vars["OCTAVE_LINK_DEPS"] = get_variable ("FLIBS", %OCTAVE_CONF_OCTAVE_LINK_DEPS%);
edc5ec6e949b maint: allow --enable-static --disable-dl to work again John W. Eaton <jwe@octave.org> parents: 12733 diff changeset	239 vars["OCT_LINK_DEPS"] = get_variable ("FLIBS", %OCTAVE_CONF_OCT_LINK_DEPS%);
edc5ec6e949b maint: allow --enable-static --disable-dl to work again John W. Eaton <jwe@octave.org> parents: 12733 diff changeset	240 vars["FLIBS"] = get_variable ("FLIBS", %OCTAVE_CONF_FLIBS%);
edc5ec6e949b maint: allow --enable-static --disable-dl to work again John W. Eaton <jwe@octave.org> parents: 12733 diff changeset	241
15929 16418ff39a72 strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile John W. Eaton <jwe@octave.org> parents: 15458 diff changeset	242 vars["LD_CXX"] = get_variable ("LD_CXX", %OCTAVE_CONF_MKOCTFILE_LD_CXX%);
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	243 vars["LDFLAGS"] = get_variable ("LDFLAGS", %OCTAVE_CONF_LDFLAGS%);
34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	244 vars["LD_STATIC_FLAG"] = get_variable ("LD_STATIC_FLAG", %OCTAVE_CONF_LD_STATIC_FLAG%);
34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	245 vars["LFLAGS"] = get_variable ("LFLAGS", DEFAULT_LFLAGS);
11251 77989197a3c7 [mq]: mkoctfile_variable Michael Goffioul <michael.goffioul@gmail.com> parents: 10721 diff changeset	246 vars["F77_INTEGER8_FLAG"] = get_variable ("F77_INTEGER8_FLAG", %OCTAVE_CONF_F77_INTEGER_8_FLAG%);
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	247
10721 4906ccf5d95e use F77_INTEGER8_FLAG in BLAS checking as well as ALL_FFLAGS in mkoctfile Jaroslav Hajek <highegg@gmail.com> parents: 9957 diff changeset	248 vars["ALL_FFLAGS"] = vars["FFLAGS"] + " " + vars["F77_INTEGER8_FLAG"];
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	249
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	250 vars["ALL_CFLAGS"] = vars["INCFLAGS"] + " " + vars["XTRA_CFLAGS"]
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	251 + " " + vars["CFLAGS"];
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	252
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	253 vars["ALL_CXXFLAGS"] = vars["INCFLAGS"] + " " + vars["XTRA_CXXFLAGS"]
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	254 + " " + vars["CXXFLAGS"];
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	255
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	256 vars["ALL_LDFLAGS"] = vars["LD_STATIC_FLAG"] + " " + vars["CPICFLAG"]
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	257 + " " + vars["LDFLAGS"];
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	258
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	259 vars["OCTAVE_LIBS"] = vars["LIBOCTINTERP"] + " " + vars["LIBOCTAVE"]
15271 648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: 14547 diff changeset	260 + " " + vars["SPECIAL_MATH_LIB"];
9538 d0239bddf621 use OCTAVE_CHECK_LIB to check for zlib John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	261
d0239bddf621 use OCTAVE_CHECK_LIB to check for zlib John W. Eaton <jwe@octave.org> parents: 9515 diff changeset	262 vars["FFTW_LIBS"] = vars["FFTW3_LDFLAGS"] + " " + vars["FFTW3_LIBS"]
9565 fe57b638e48c adapt octave-bug.cc.in and mkoctfile.cc.in to recent configure changes Benjamin Lindner <lindnerb@users.sourceforge.net> parents: 9538 diff changeset	263 + " " + vars["FFTW3F_LDFLAGS"] + " " + vars["FFTW3F_LIBS"];
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	264 }
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	265
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	266 static string usage_msg = "usage: mkoctfile [options] file ...";
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	267 static string version_msg = "mkoctfile, version " + OCTAVE_VERSION;
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	268 static bool debug = false;
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	269 static string help_msg =
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	270 "\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	271 "Options:\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	272 "\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	273 " -h, -?, --help Print this message.\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	274 "\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	275 " -IDIR Add -IDIR to compile commands.\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	276 "\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	277 " -idirafter DIR Add -idirafter DIR to compile commands.\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	278 "\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	279 " -DDEF Add -DDEF to compile commands.\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	280 "\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	281 " -lLIB Add library LIB to link command.\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	282 "\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	283 " -LDIR Add -LDIR to link command.\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	284 "\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	285 " -M, --depend Generate dependency files (.d) for C and C++\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	286 " source files.\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	287 "\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	288 " -RDIR Add -RDIR to link command.\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	289 "\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	290 " -Wl,... Pass flags though the linker like -Wl,-rpath=...\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	291 "\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	292 " -W... Pass flags though the compiler like -Wa,OPTION.\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	293 "\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	294 " -c, --compile Compile, but do not link.\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	295 "\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	296 " -o FILE, --output FILE Output file name. Default extension is .oct\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	297 " (or .mex if --mex is specified) unless linking\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	298 " a stand-alone executable.\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	299 "\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	300 " -g Enable debugging options for compilers.\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	301 "\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	302 " -p VAR, --print VAR Print configuration variable VAR. Recognized\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	303 " variables are:\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	304 "\n"
15944 4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	305 " ALL_CFLAGS FFTW3F_LDFLAGS\n"
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	306 " ALL_CXXFLAGS FFTW3F_LIBS\n"
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	307 " ALL_FFLAGS FLIBS\n"
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	308 " ALL_LDFLAGS FPICFLAG\n"
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	309 " AR INCFLAGS\n"
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	310 " BLAS_LIBS LAPACK_LIBS\n"
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	311 " CC LDFLAGS\n"
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	312 " CFLAGS LD_CXX\n"
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	313 " CPICFLAG LD_STATIC_FLAG\n"
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	314 " CPPFLAGS LFLAGS\n"
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	315 " CXX LIBOCTAVE\n"
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	316 " CXXFLAGS LIBOCTINTERP\n"
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	317 " CXXPICFLAG LIBS\n"
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	318 " DEPEND_EXTRA_SED_PATTERN OCTAVE_LIBS\n"
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	319 " DEPEND_FLAGS OCTAVE_LINK_DEPS\n"
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	320 " DL_LD OCT_LINK_DEPS\n"
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	321 " DL_LDFLAGS RANLIB\n"
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	322 " EXEEXT RDYNAMIC_FLAG\n"
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	323 " F77 READLINE_LIBS\n"
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	324 " F77_INTEGER_8_FLAG SED\n"
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	325 " FFLAGS XTRA_CFLAGS\n"
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	326 " FFTW3_LDFLAGS XTRA_CXXFLAGS\n"
4803b8c138e3 use mkoctfile, not octave_config_info to get default pkg compiler tools John W. Eaton <jwe@octave.org> parents: 15933 diff changeset	327 " FFTW3_LIBS\n"
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	328 "\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	329 " --link-stand-alone Link a stand-alone executable file.\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	330 "\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	331 " --mex Assume we are creating a MEX file. Set the\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	332 " default output extension to \".mex\".\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	333 "\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	334 " -s, --strip Strip output file.\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	335 "\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	336 " -v, --verbose Echo commands as they are executed.\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	337 "\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	338 " FILE Compile or link FILE. Recognized file types are:\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	339 "\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	340 " .c C source\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	341 " .cc C++ source\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	342 " .C C++ source\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	343 " .cpp C++ source\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	344 " .f Fortran source (fixed form)\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	345 " .F Fortran source (fixed form)\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	346 " .f90 Fortran source (free form)\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	347 " .F90 Fortran source (free form)\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	348 " .o object file\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	349 " .a library file\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	350 #ifdef _MSC_VER
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	351 " .lib library file\n"
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	352 #endif
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	353 "\n";
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	354
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	355 static string
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	356 basename (const string& s, bool strip_path = false)
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	357 {
15299 8bd5c490b787 Fix mex compilation with subdirs on Windows platforms (bug #37122) Rik <rik@octave.org> parents: 15271 diff changeset	358 string retval;
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	359 size_t pos = s.rfind ('.');
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	360
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	361 if (pos == string::npos)
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	362 retval = s;
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	363 else
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	364 retval = s.substr (0, pos);
15299 8bd5c490b787 Fix mex compilation with subdirs on Windows platforms (bug #37122) Rik <rik@octave.org> parents: 15271 diff changeset	365
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	366 if (strip_path)
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	367 {
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	368 size_t p1 = retval.rfind ('/'), p2 = retval.rfind ('\\');
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	369 pos = (p1 != string::npos && p2 != string::npos
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	370 ? max (p1, p2) : (p2 != string::npos ? p2 : p1));
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	371 if (pos != string::npos)
15299 8bd5c490b787 Fix mex compilation with subdirs on Windows platforms (bug #37122) Rik <rik@octave.org> parents: 15271 diff changeset	372 retval = retval.substr (++pos, string::npos);
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	373 }
15299 8bd5c490b787 Fix mex compilation with subdirs on Windows platforms (bug #37122) Rik <rik@octave.org> parents: 15271 diff changeset	374
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	375 return retval;
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	376 }
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	377
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	378 inline bool
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	379 starts_with (const string& s, const string& prefix)
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	380 {
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	381 return (s.length () >= prefix.length () && s.find (prefix) == 0);
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	382 }
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	383
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	384 inline bool
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	385 ends_with (const string& s, const string& suffix)
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	386 {
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	387 return (s.length () >= suffix.length ()
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	388 && s.rfind (suffix) == s.length () - suffix.length ());
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	389 }
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	390
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	391 static int
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	392 run_command (const string& cmd)
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	393 {
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	394 if (debug)
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	395 cout << cmd << endl;
8332 34fde4755a0f style fixes John W. Eaton <jwe@octave.org> parents: 8092 diff changeset	396 return system (cmd.c_str ());
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	397 }
4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	398
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	399 int
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	400 main (int argc, char **argv)
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	401 {
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	402 initialize ();
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	403
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	404 string file, output_option;
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	405 list<string> cfiles, ccfiles, f77files;
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	406 int result = 0;
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	407
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	408 string objfiles = "";
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	409 string libfiles = "";
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	410 string octfile = "";
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	411 string outputfile = "";
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	412 string incflags = "";
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	413 string defs = "";
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	414 string ldflags = "";
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	415 string pass_on_options = "";
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	416 bool strip = false;
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	417 bool no_oct_file_strip_on_this_platform = %NO_OCT_FILE_STRIP%;
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	418 bool link = true;
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	419 bool link_stand_alone = false;
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	420 string output_ext = ".oct";
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	421 bool depend = false;
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	422 bool compile = true;
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	423
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	424 if (argc == 1)
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	425 {
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	426 cout << usage_msg << endl;
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	427 return 1;
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	428 }
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	429
9955 33537a4d223f mkoctfile.cc.in: accept long options with single - John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	430 if (argc == 2 && (!strcmp (argv[1], "-v")
33537a4d223f mkoctfile.cc.in: accept long options with single - John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	431 \|\| !strcmp (argv[1], "-version")
33537a4d223f mkoctfile.cc.in: accept long options with single - John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	432 \|\| !strcmp (argv[1], "--version")))
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	433 {
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	434 cout << version_msg << endl;
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	435 return 0;
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	436 }
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	437
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	438 for (int i = 1; i < argc; i++)
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	439 {
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	440 string arg = argv[i];
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	441
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	442 if (ends_with (arg, ".c"))
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	443 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	444 file = arg;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	445 cfiles.push_back (file);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	446 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	447 else if (ends_with (arg, ".cc") \|\| ends_with (arg, ".C")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	448 \|\| ends_with (arg, ".cpp"))
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	449 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	450 file = arg;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	451 ccfiles.push_back (file);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	452 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	453 else if (ends_with (arg, ".f") \|\| ends_with (arg, ".F")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	454 \|\| ends_with (arg, "f90") \|\| ends_with (arg, ".F90"))
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	455 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	456 file = arg;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	457 f77files.push_back (file);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	458 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	459 else if (ends_with (arg, ".o") \|\| ends_with (arg, ".obj"))
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	460 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	461 file = arg;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	462 objfiles += (" " + quote_path (arg));
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	463 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	464 else if (ends_with (arg, ".lib") \|\| ends_with (arg, ".a"))
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	465 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	466 file = arg;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	467 libfiles += (" " + quote_path (arg));
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	468 }
9955 33537a4d223f mkoctfile.cc.in: accept long options with single - John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	469 else if (arg == "-d" \|\| arg == "-debug" \|\| arg == "--debug"
33537a4d223f mkoctfile.cc.in: accept long options with single - John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	470 \|\| arg == "-v" \|\| arg == "-verbose" \|\| arg == "--verbose")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	471 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	472 debug = true;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	473 if (vars["CC"] == "cc-msvc")
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	474 vars["CC"] += " -d";
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	475 if (vars["CXX"] == "cc-msvc")
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	476 vars["CXX"] += " -d";
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	477 if (vars["DL_LD"] == "cc-msvc")
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	478 vars["DL_LD"] += " -d";
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	479 }
9955 33537a4d223f mkoctfile.cc.in: accept long options with single - John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	480 else if (arg == "-h" \|\| arg == "-?" \|\| arg == "-help" \|\| arg == "--help")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	481 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	482 cout << usage_msg << endl;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	483 cout << help_msg << endl;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	484 return 0;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	485 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	486 else if (starts_with (arg, "-I"))
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	487 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	488 incflags += (" " + quote_path (arg));
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	489 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	490 else if (arg == "-idirafter")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	491 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	492 if (i < argc-1)
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	493 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	494 arg = argv[++i];
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	495 incflags += (" -idirafter " + arg);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	496 }
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	497 else
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	498 cerr << "mkoctfile: include directory name missing" << endl;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	499 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	500 else if (starts_with (arg, "-D"))
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	501 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	502 defs += (" " + arg);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	503 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	504 else if (starts_with (arg, "-Wl,") \|\| starts_with (arg, "-l")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	505 \|\| starts_with (arg, "-L") \|\| starts_with (arg, "-R"))
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	506 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	507 ldflags += (" " + arg);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	508 }
9955 33537a4d223f mkoctfile.cc.in: accept long options with single - John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	509 else if (arg == "-M" \|\| arg == "-depend" \|\| arg == "--depend")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	510 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	511 depend = true;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	512 compile = false;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	513 }
9955 33537a4d223f mkoctfile.cc.in: accept long options with single - John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	514 else if (arg == "-o" \|\| arg == "-output" \|\| arg == "--output")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	515 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	516 if (i < argc-1)
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	517 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	518 arg = argv[++i];
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	519 outputfile = arg;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	520 }
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	521 else
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	522 cerr << "mkoctfile: output file name missing" << endl;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	523 }
9955 33537a4d223f mkoctfile.cc.in: accept long options with single - John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	524 else if (arg == "-p" \|\| arg == "-print" \|\| arg == "--print")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	525 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	526 if (i < argc-1)
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	527 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	528 arg = argv[++i];
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	529 cout << vars[arg] << endl;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	530 return 0;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	531 }
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	532 else
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	533 cerr << "mkoctfile: --print requires argument" << endl;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	534 }
9955 33537a4d223f mkoctfile.cc.in: accept long options with single - John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	535 else if (arg == "-s" \|\| arg == "-strip" \|\| arg == "--strip")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	536 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	537 if (no_oct_file_strip_on_this_platform)
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	538 cerr << "mkoctfile: stripping disabled on this platform" << endl;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	539 else
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	540 strip = true;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	541 }
9955 33537a4d223f mkoctfile.cc.in: accept long options with single - John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	542 else if (arg == "-c" \|\| arg == "-compile" \|\| arg == "--compile")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	543 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	544 link = false;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	545 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	546 else if (arg == "-g")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	547 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	548 vars["ALL_CFLAGS"] += " -g";
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	549 vars["ALL_CXXFLAGS"] += " -g";
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	550 vars["ALL_FFLAGS"] += " -g";
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	551 }
9955 33537a4d223f mkoctfile.cc.in: accept long options with single - John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	552 else if (arg == "-link-stand-alone" \|\| arg == "--link-stand-alone")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	553 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	554 link_stand_alone = true;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	555 }
9955 33537a4d223f mkoctfile.cc.in: accept long options with single - John W. Eaton <jwe@octave.org> parents: 9794 diff changeset	556 else if (arg == "-mex" \|\| arg == "--mex")
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	557 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	558 incflags += " -I.";
9303 adf676387922 properly #ifdef MSVC linker specific flags Benjamin Lindner <lindnerb@users.sourceforge.net> parents: 9245 diff changeset	559 #ifdef _MSC_VER
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	560 ldflags += " -Wl,-export:mexFunction";
9303 adf676387922 properly #ifdef MSVC linker specific flags Benjamin Lindner <lindnerb@users.sourceforge.net> parents: 9245 diff changeset	561 #endif
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	562 output_ext = ".mex";
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	563 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	564 else if (starts_with (arg, "-W"))
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	565 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	566 pass_on_options += (" " + arg);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	567 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	568 else
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	569 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	570 cerr << "mkoctfile: unrecognized argument " << arg;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	571 return 1;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	572 }
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	573
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	574 if (!file.empty () && octfile.empty ())
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	575 octfile = file;
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	576 }
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	577
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	578 if (link_stand_alone)
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	579 {
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	580 if (!outputfile.empty ())
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	581 output_option = "-o " + outputfile;
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	582 }
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	583 else
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	584 {
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	585 if (!outputfile.empty ())
9957 59ed11557715 mkoctfile: if output file is specified and it does not end in output_ext, append output_ext John W. Eaton <jwe@octave.org> parents: 9956 diff changeset	586 {
59ed11557715 mkoctfile: if output file is specified and it does not end in output_ext, append output_ext John W. Eaton <jwe@octave.org> parents: 9956 diff changeset	587 octfile = outputfile;
59ed11557715 mkoctfile: if output file is specified and it does not end in output_ext, append output_ext John W. Eaton <jwe@octave.org> parents: 9956 diff changeset	588 size_t len = octfile.length ();
59ed11557715 mkoctfile: if output file is specified and it does not end in output_ext, append output_ext John W. Eaton <jwe@octave.org> parents: 9956 diff changeset	589 size_t len_ext = output_ext.length ();
59ed11557715 mkoctfile: if output file is specified and it does not end in output_ext, append output_ext John W. Eaton <jwe@octave.org> parents: 9956 diff changeset	590 if (octfile.substr (len-len_ext) != output_ext)
59ed11557715 mkoctfile: if output file is specified and it does not end in output_ext, append output_ext John W. Eaton <jwe@octave.org> parents: 9956 diff changeset	591 octfile += output_ext;
59ed11557715 mkoctfile: if output file is specified and it does not end in output_ext, append output_ext John W. Eaton <jwe@octave.org> parents: 9956 diff changeset	592 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	593 else
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	594 octfile = basename (octfile, true) + output_ext;
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	595 }
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	596
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	597 list<string>::const_iterator it;
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	598
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	599 if (depend)
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	600 {
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	601 for (it = cfiles.begin (); it != cfiles.end (); ++it)
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	602 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	603 string f = *it, dfile = basename (f, true) + ".d", line;
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	604
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	605 unlink (dfile.c_str ());
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	606 string cmd = vars["CC"] + " " + vars["DEPEND_FLAGS"] + " "
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	607 + vars["CPPFLAGS"] + " " + vars["ALL_CFLAGS"] + " "
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	608 + incflags + " " + defs + " " + quote_path (f);
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	609
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	610 FILE *fd = popen (cmd.c_str (), "r");
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	611 ofstream fo (dfile.c_str ());
15458 1cc42df8ede7 mkoctfile.in.cc: Change variable types to stop compilation warnings. Rik <rik@octave.org> parents: 15309 diff changeset	612 size_t pos;
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	613 while (!feof (fd))
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	614 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	615 line = get_line (fd);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	616 if ((pos = line.rfind (".o:")) != string::npos)
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	617 {
15458 1cc42df8ede7 mkoctfile.in.cc: Change variable types to stop compilation warnings. Rik <rik@octave.org> parents: 15309 diff changeset	618 size_t spos = line.rfind ('/', pos);
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	619 string ofile = (spos == string::npos ? line.substr (0, pos+2) : line.substr (spos+1, pos-spos+1));
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	620 fo << "pic/" << ofile << " " << ofile << " " << dfile << line.substr (pos) << endl;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	621 }
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	622 else
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	623 fo << line << endl;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	624 }
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	625 pclose (fd);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	626 fo.close ();
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	627 }
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	628
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	629 for (it = ccfiles.begin (); it != ccfiles.end (); ++it)
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	630 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	631 string f = *it, dfile = basename (f, true) + ".d", line;
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	632
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	633 unlink (dfile.c_str ());
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	634 string cmd = vars["CC"] + " " + vars["DEPEND_FLAGS"] + " "
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	635 + vars["CPPFLAGS"] + " " + vars["ALL_CXXFLAGS"] + " "
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	636 + incflags + " " + defs + " " + quote_path (f);
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	637
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	638 FILE *fd = popen (cmd.c_str (), "r");
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	639 ofstream fo (dfile.c_str ());
15458 1cc42df8ede7 mkoctfile.in.cc: Change variable types to stop compilation warnings. Rik <rik@octave.org> parents: 15309 diff changeset	640 size_t pos;
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	641 while (!feof (fd))
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	642 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	643 line = get_line (fd);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	644 if ((pos = line.rfind (".o:")) != string::npos)
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	645 {
15458 1cc42df8ede7 mkoctfile.in.cc: Change variable types to stop compilation warnings. Rik <rik@octave.org> parents: 15309 diff changeset	646 size_t spos = line.rfind ('/', pos);
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	647 string ofile = (spos == string::npos ? line.substr (0, pos+2) : line.substr (spos+1, pos-spos+1));
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	648 fo << "pic/" << ofile << " " << ofile << " " << dfile << line.substr (pos+2) << endl;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	649 }
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	650 else
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	651 fo << line << endl;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	652 }
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	653 pclose (fd);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	654 fo.close ();
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	655 }
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	656
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	657 return 0;
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	658 }
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	659
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	660 for (it = f77files.begin (); it != f77files.end (); ++it)
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	661 {
9956 f26a33e21db9 mkoctfile: when compiling files in subdirectories, place object files in current directory by default John W. Eaton <jwe@octave.org> parents: 9955 diff changeset	662 string f = *it, b = basename (f, true);
9187 a3237ae32c0d eliminate last remnants of F2C variables John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	663 if (!vars["F77"].empty ())
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	664 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	665 string o;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	666 if (!outputfile.empty ())
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	667 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	668 if (link)
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	669 o = b + ".o";
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	670 else
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	671 o = outputfile;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	672 }
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	673 else
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	674 o = b + ".o";
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	675 objfiles += (" " + o);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	676 string cmd = vars["F77"] + " -c " + vars["FPICFLAG"] + " "
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	677 + vars["ALL_FFLAGS"] + " " + incflags + " " + defs + " "
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	678 + pass_on_options + " " + f + " -o " + o;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	679 result = run_command (cmd);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	680 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	681 else
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	682 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	683 cerr << "mkoctfile: no way to compile Fortran file " << f << endl;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	684 return 1;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	685 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	686 }
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	687
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	688 for (it = cfiles.begin (); it != cfiles.end (); ++it)
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	689 {
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	690 string f = *it;
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	691 if (!vars["CC"].empty ())
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	692 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	693 string b = basename (f, true), o;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	694 if (!outputfile.empty ())
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	695 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	696 if (link)
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	697 o = b + ".o";
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	698 else
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	699 o = outputfile;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	700 }
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	701 else
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	702 o = b + ".o";
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	703 objfiles += (" " + o);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	704 string cmd = vars["CC"] + " -c " + vars["CPPFLAGS"] + " "
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	705 + vars["CPICFLAG"] + " " + vars["ALL_CFLAGS"] + " "
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	706 + pass_on_options + " " + incflags + " " + defs + " "
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	707 + quote_path (f) + " -o " + quote_path (o);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	708 result = run_command (cmd);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	709 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	710 else
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	711 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	712 cerr << "mkoctfile: no way to compile C file " << f << endl;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	713 return 1;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	714 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	715 }
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	716
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	717 for (it = ccfiles.begin (); it != ccfiles.end (); ++it)
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	718 {
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	719 string f = *it;
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	720 if (!vars["CXX"].empty ())
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	721 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	722 string b = basename (f, true), o;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	723 if (!outputfile.empty ())
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	724 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	725 if (link)
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	726 o = b + ".o";
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	727 else
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	728 o = outputfile;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	729 }
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	730 else
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	731 o = b + ".o";
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	732 objfiles += (" " + o);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	733 string cmd = vars["CXX"] + " -c " + vars["CPPFLAGS"] + " "
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	734 + vars["CXXPICFLAG"] + " " + vars["ALL_CXXFLAGS"] + " "
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	735 + pass_on_options + " " + incflags + " " + defs + " "
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	736 + quote_path (f) + " -o " + quote_path (o);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	737 result = run_command (cmd);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	738 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	739 else
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	740 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	741 cerr << "mkoctfile: no way to compile C++ file " << f << endl;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	742 return 1;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	743 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	744 }
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	745
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	746 if (link && !objfiles.empty ())
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	747 {
6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	748 if (link_stand_alone)
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	749 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	750 if (!vars["LD_CXX"].empty ())
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	751 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	752 string cmd = vars["LD_CXX"] + " " + vars["CPPFLAGS"] + " "
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	753 + vars["ALL_CXXFLAGS"] + " " + vars["RDYNAMIC_FLAG"]
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	754 + " " + vars["ALL_LDFLAGS"] + " " + pass_on_options
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	755 + " " + output_option + " " + objfiles + " " + libfiles
13024 f3c53fea9fb5 maint: more linking tweaks John W. Eaton <jwe@octave.org> parents: 13010 diff changeset	756 + " " + ldflags + " " + vars["LFLAGS"]
15271 648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: 14547 diff changeset	757 + " -loctinterp -loctave "
13010 edc5ec6e949b maint: allow --enable-static --disable-dl to work again John W. Eaton <jwe@octave.org> parents: 12733 diff changeset	758 + " " + vars["OCT_LINK_OPTS"]
edc5ec6e949b maint: allow --enable-static --disable-dl to work again John W. Eaton <jwe@octave.org> parents: 12733 diff changeset	759 + " " + vars["OCTAVE_LINK_DEPS"];
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	760 result = run_command (cmd);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	761 }
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	762 else
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	763 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	764 cerr << "mkoctfile: no way to link stand-alone executable file"
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	765 << endl;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	766 return 1;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	767 }
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	768 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	769 else
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	770 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	771 string cmd = vars["DL_LD"] + " " + vars["DL_LDFLAGS"] + " "
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	772 + pass_on_options + " -o " + octfile + " " + objfiles + " "
13024 f3c53fea9fb5 maint: more linking tweaks John W. Eaton <jwe@octave.org> parents: 13010 diff changeset	773 + libfiles + " " + ldflags + " " + vars["LFLAGS"]
15271 648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: 14547 diff changeset	774 + " -loctinterp -loctave "
13010 edc5ec6e949b maint: allow --enable-static --disable-dl to work again John W. Eaton <jwe@octave.org> parents: 12733 diff changeset	775 + vars["OCT_LINK_OPTS"] + " " + vars["OCT_LINK_DEPS"];
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	776 result = run_command (cmd);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	777 }
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	778
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	779 if (strip)
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	780 {
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	781 string cmd = "strip " + octfile;
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	782 result = run_command (cmd);
db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 11561 diff changeset	783 }
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	784 }
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	785
8092 6a292b0fa88c mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: style fixes John W. Eaton <jwe@octave.org> parents: 8091 diff changeset	786 return result;
8091 4e7527a7b3f9 mkoctfile.cc.in, octave-config.cc.in, octave-bug.cc.in: new files Michael Goffioul parents: diff changeset	787 }

Mercurial > hg > octave-nkf

annotate src/mkoctfile.in.cc @ 15946:25eff7fe556d