Changeset ee668e in git for factory/canonicalform.h

Timestamp:

Nov 17, 2011, 5:23:11 PM (11 years ago)

Author:

Jan Engelhardt <jengelh@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

b7d64b3fc45a85f34ae6f34e9c227eed2796c70f

Parents:

f0168a594d5a00a74dd169a3d0189411e29989f4

git-author:

Jan Engelhardt <jengelh@medozas.de>2011-11-17 17:23:11+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-01-06 21:09:33+01:00

Message:

factory/build: restore out-of-tree build support

When attempting an OOT build, it fails to find <factory/cplusplus.h>,
because cplusplus.h is always (even in in-tree builds) produced in
"${builddir}", and not "${top_srcdir}/../factory".

Furthermore, one must not rely on the basename of ${top_srcdir}, and
going above ${top_srcdir} is undefined and may lead to spurious build
failures. (Consider a hypothetical chroot on ${top_srcdir}).

Therefore, create a directory include/factory and use -Iinclude such
that <factory/*> yields a buildable state, move all exported header
files there.

Previous OOT build log:

17:22 seven:../factory/obj > make
  CXX    cplusplus.o
  CXXLD  cplusplus
./cplusplus > ./cplusplus.h
../bin/makeheader ../factory.template factory.h
../bin/makeheader ../factoryconf.template factoryconf.h
  YACC   readcf.cc
make  all-am
make[1]: Entering directory `/home/jengelh/obs/zu/home/jengelh/science/singsource/factory/obj'
  CXX    libfactory_a-algext.o
  CXX    libfactory_a-canonicalform.o
In file included from ../cf_factory.h:12:0,
                 from ../canonicalform.cc:7:
../../factory/cf_gmp.h:14:33: fatal error: factory/cplusplus.h: Ingen slik fil eller filkatalog
compilation terminated.
make[1]: *** [libfactory_a-canonicalform.o] Error 1
make[1]: Leaving directory `/home/jengelh/obs/zu/home/jengelh/science/singsource/factory/obj'
make: *** [all] Error 2

File:

• factory/canonicalform.h (modified) (1 diff)

factory/canonicalform.h

@@ -21 +21 @@
 #include "cf_defs.h"
 #include "variable.h"
-#include "templates/ftmpl_list.h"
-#include "templates/ftmpl_array.h"
-#include "templates/ftmpl_factor.h"
-#include "templates/ftmpl_matrix.h"
+#include <factory/templates/ftmpl_list.h>
+#include <factory/templates/ftmpl_array.h>
+#include <factory/templates/ftmpl_factor.h>
+#include <factory/templates/ftmpl_matrix.h>
 
 /*BEGINPUBLIC*/