diff options
| author | dos-reis <gdr@axiomatics.org> | 2014-02-21 14:09:17 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2014-02-21 14:09:17 +0000 |
| commit | 94959a8e7991c09ecaa72ca1c3fdc326ddb28819 (patch) | |
| tree | 4da4fc27c9d06ccab66fd45367932d01382877a2 /src/syntax | |
| parent | cd97141c5bad0d39915d37c132948f403adeb00f (diff) | |
| download | open-axiom-94959a8e7991c09ecaa72ca1c3fdc326ddb28819.tar.gz | |
Set derived src and target directory variables
Diffstat (limited to 'src/syntax')
| -rw-r--r-- | src/syntax/Makefile.am | 6 | ||||
| -rw-r--r-- | src/syntax/Makefile.in | 26 |
2 files changed, 17 insertions, 15 deletions
diff --git a/src/syntax/Makefile.am b/src/syntax/Makefile.am index 964f7e54..a6a8c433 100644 --- a/src/syntax/Makefile.am +++ b/src/syntax/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2013, Gabriel Dos Reis. +# Copyright (C) 2013-2014, Gabriel Dos Reis. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -34,9 +34,7 @@ noinst_LIBRARIES = libsyntax.a libsyntax_a_SOURCES = token.cc sexpr.cc -oa_target_incdir = $(top_builddir)/$(target)/include - -libsyntax_a_CPPFLAGS = -I$(top_srcdir)/src/include -I$(oa_target_incdir) +libsyntax_a_CPPFLAGS = -I$(top_srcdir)/src/include -I$(oa_target_includedir) .PHONY: all-syntax diff --git a/src/syntax/Makefile.in b/src/syntax/Makefile.in index f296f207..98cc903d 100644 --- a/src/syntax/Makefile.in +++ b/src/syntax/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# Copyright (C) 2013, Gabriel Dos Reis. +# Copyright (C) 2013-2014, Gabriel Dos Reis. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -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 = libsyntax.a libsyntax_a_SOURCES = token.cc sexpr.cc -oa_target_incdir = $(top_builddir)/$(target)/include -libsyntax_a_CPPFLAGS = -I$(top_srcdir)/src/include -I$(oa_target_incdir) +libsyntax_a_CPPFLAGS = -I$(top_srcdir)/src/include -I$(oa_target_includedir) all: all-am .SUFFIXES: |