|
From: | Daniel J Sebald |
Subject: | Re: OP_SRCDIR rule |
Date: | Sat, 01 Sep 2012 12:49:40 -0500 |
User-agent: | Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.24) Gecko/20111108 Fedora/3.1.16-1.fc14 Thunderbird/3.1.16 |
On 09/01/2012 11:26 AM, Rik wrote:
On 09/01/2012 08:06 AM, John W. Eaton wrote:| prefix=mx ../../../octave/liboctave/operators/mx-ops) I checked in the following change (same as I posted earlier except for the added commit message): http://hg.savannah.gnu.org/hgweb/octave/rev/dd794aa84232 I don't know why you are seeing the failure. It works for me when building in a clean directory tree.9/1/12 John, Thanks for that. I can't build the gui right now without manually tweaking the code so I missed that it wasn't compiling there. It was such a big change too that I hadn't moved libcruft to be a convenience library, although that was my next step until you tackled it. I think verifying and slowly reducing the number of unnecessary includes is a good next step. With your changeset applied I am seeing the same issue as Daniel. I re-instated the original rules in operators/module.mk which had an extra directory level '../' and it works again. I've attached the diff, but I don't want to apply it until you can verify that they work for you as well.
I worked from the Hg tip and then applied the patch. -R was needed to apply and the compilation failed, so I'm guessing this has been integrated already.
Compilation appears to be proceeding, but I notice now there seems to be duplicate includes:
libtool: compile: g++ -DHAVE_CONFIG_H -I. -I../../octave/libinterp -I.. -I../../octave/liboctave/cruft/misc -I../liboctave/array -I../../octave/liboctave/array -I../liboctave/numeric -I../../octave/liboctave/numeric -I../liboctave/operators -I../../octave/liboctave/operators -I../liboctave/system -I../../octave/liboctave/system -I../liboctave/util -I../../octave/liboctave/util -I../liboctave -I../../octave/liboctave -I../../octave/libinterp/octave-value -I../../octave/libinterp/operators -Iparse-tree -I../../octave/libinterp/parse-tree -Iinterp-core -I../../octave/libinterp/interp-core -Iinterpfcn -I../../octave/libinterp/interpfcn -Icorefcn -I../libgnu -I../../octave/libgnu -g -O2 -pthread -I/usr/include/freetype2 -Wall -W -Wshadow -Wold-style-cast -Wformat -Wpointer-arith -Wwrite-strings -Wcast-align -Wcast-qual -g -O2 -pthread -MT corefcn/corefcn_libcorefcn_la-givens.lo -MD -MP -MF corefcn/.deps/corefcn_libcorefcn_la-givens.Tpo -c ../../octave/libinterp/corefcn/givens.cc -fPIC -DPIC -o corefcn/.libs/corefcn_libcorefcn_la-givens.o
i.e., -I../liboctave/array -I../../octave/liboctave/array -I../liboctave/numeric -I../../octave/liboctave/numeric -I../liboctave/operators -I../../octave/liboctave/operators -I../liboctave/system -I../../octave/liboctave/system -I../liboctave/util -I../../octave/liboctave/util -I../liboctave -I../../octave/liboctave -I../../octave/libinterp/octave-value -I../../octave/libinterp/operators -Iparse-tree -I../../octave/libinterp/parse-tree -Iinterp-core -I../../octave/libinterp/interp-core -Iinterpfcn -I../../octave/libinterp/interpfcn -I../libgnu -I../../octave/libgnu Dan
[Prev in Thread] | Current Thread | [Next in Thread] |