aboutsummaryrefslogtreecommitdiff
path: root/src/io
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2014-02-21 14:09:17 +0000
committerdos-reis <gdr@axiomatics.org>2014-02-21 14:09:17 +0000
commit94959a8e7991c09ecaa72ca1c3fdc326ddb28819 (patch)
tree4da4fc27c9d06ccab66fd45367932d01382877a2 /src/io
parentcd97141c5bad0d39915d37c132948f403adeb00f (diff)
downloadopen-axiom-94959a8e7991c09ecaa72ca1c3fdc326ddb28819.tar.gz
Set derived src and target directory variables
Diffstat (limited to 'src/io')
-rw-r--r--src/io/Makefile.am4
-rw-r--r--src/io/Makefile.in24
2 files changed, 15 insertions, 13 deletions
diff --git a/src/io/Makefile.am b/src/io/Makefile.am
index 63fbf41e..76ea5fc1 100644
--- a/src/io/Makefile.am
+++ b/src/io/Makefile.am
@@ -34,9 +34,7 @@ noinst_LIBRARIES = libio.a
libio_a_SOURCES = Input.cc std-streams.cc
-oa_target_incdir = $(top_builddir)/$(target)/include
-
-libio_a_CPPFLAGS = -I$(top_srcdir)/src/include -I$(oa_target_incdir)
+libio_a_CPPFLAGS = -I$(top_srcdir)/src/include -I$(oa_target_includedir)
.PHONY: all-io
diff --git a/src/io/Makefile.in b/src/io/Makefile.in
index cc8d0346..c25b09e2 100644
--- a/src/io/Makefile.in
+++ b/src/io/Makefile.in
@@ -334,13 +334,6 @@ localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
-oa_build_bindir = @oa_build_bindir@
-oa_build_datadir = @oa_build_datadir@
-oa_build_docdir = @oa_build_docdir@
-oa_build_libdir = @oa_build_libdir@
-oa_build_mandir = @oa_build_mandir@
-oa_build_texdir = @oa_build_texdir@
-oa_builddir = @oa_builddir@
oa_c_macros = @oa_c_macros@
oa_c_runtime = @oa_c_runtime@
oa_c_runtime_extra = @oa_c_runtime_extra@
@@ -360,8 +353,20 @@ oa_optimize_options = @oa_optimize_options@
oa_quiet_flags = @oa_quiet_flags@
oa_shrlib_flags = @oa_shrlib_flags@
oa_shrobj_flags = @oa_shrobj_flags@
+oa_src_algdir = @oa_src_algdir@
+oa_src_datadir = @oa_src_datadir@
+oa_src_docdir = @oa_src_docdir@
+oa_src_srcdir = @oa_src_srcdir@
+oa_src_texdir = @oa_src_texdir@
oa_standard_linking = @oa_standard_linking@
-oa_top_builddir = @oa_top_builddir@
+oa_target_bindir = @oa_target_bindir@
+oa_target_datadir = @oa_target_datadir@
+oa_target_docdir = @oa_target_docdir@
+oa_target_includedir = @oa_target_includedir@
+oa_target_libdir = @oa_target_libdir@
+oa_target_srcdir = @oa_target_srcdir@
+oa_target_texdir = @oa_target_texdir@
+oa_targetdir = @oa_targetdir@
oa_use_dynamic_lib = @oa_use_dynamic_lib@
oa_use_libtool_for_shared_lib = @oa_use_libtool_for_shared_lib@
oa_use_x = @oa_use_x@
@@ -389,8 +394,7 @@ top_srcdir = @top_srcdir@
void_type = @void_type@
noinst_LIBRARIES = libio.a
libio_a_SOURCES = Input.cc std-streams.cc
-oa_target_incdir = $(top_builddir)/$(target)/include
-libio_a_CPPFLAGS = -I$(top_srcdir)/src/include -I$(oa_target_incdir)
+libio_a_CPPFLAGS = -I$(top_srcdir)/src/include -I$(oa_target_includedir)
all: all-am
.SUFFIXES: