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 | |
parent | cd97141c5bad0d39915d37c132948f403adeb00f (diff) | |
download | open-axiom-94959a8e7991c09ecaa72ca1c3fdc326ddb28819.tar.gz |
Set derived src and target directory variables
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.in | 22 | ||||
-rw-r--r-- | src/algebra/Makefile.am | 25 | ||||
-rw-r--r-- | src/algebra/Makefile.in | 39 | ||||
-rw-r--r-- | src/boot/Makefile.in | 3 | ||||
-rw-r--r-- | src/interp/Makefile.in | 2 | ||||
-rw-r--r-- | src/io/Makefile.am | 4 | ||||
-rw-r--r-- | src/io/Makefile.in | 24 | ||||
-rw-r--r-- | src/lisp/Makefile.in | 2 | ||||
-rw-r--r-- | src/rt/Makefile.am | 2 | ||||
-rw-r--r-- | src/rt/Makefile.in | 23 | ||||
-rw-r--r-- | src/syntax/Makefile.am | 6 | ||||
-rw-r--r-- | src/syntax/Makefile.in | 26 |
12 files changed, 84 insertions, 94 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 8c39ab3d..a88f874e 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -337,13 +337,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@ @@ -363,8 +356,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 = $(top_builddir)/$(target) 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@ @@ -402,7 +407,6 @@ subdirs = \ etc graph hyper input interp \ lib io lisp share sman utils -oa_targetdir = $(top_builddir)/$(target) oa_incdir = $(oa_targetdir)/include/open-axiom oa_src_include_headers = \ defaults.H \ diff --git a/src/algebra/Makefile.am b/src/algebra/Makefile.am index 7cbdb34b..6825f6d8 100644 --- a/src/algebra/Makefile.am +++ b/src/algebra/Makefile.am @@ -1,6 +1,6 @@ # Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. # All rights reserved. -# Copyright (C) 2007-2013, Gabriel Dos Reis. +# Copyright (C) 2007-2014, Gabriel Dos Reis. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -68,23 +68,6 @@ # Compile order is important. Here we try to define the ordered lattice # of spad file dependencies. However this is, in reality, a graph rather # than a lattice. -# - -oa_targetdir = $(top_builddir)/$(target) -oa_target_bindir = $(oa_targetdir)/bin -oa_target_libdir = $(oa_targetdir)/lib -oa_target_docdir = $(oa_targetdir)/doc -oa_target_srcdir = $(oa_targetdir)/src -oa_target_datadir = $(oa_targetdir)/share - -oa_src_srcdir = $(top_srcdir)/src -oa_src_docdir = $(top_srcdir)/doc -oa_src_datadir = $(oa_src_srcdir)/share - -oa_builddir = $(top_builddir)/build-$(build) -oa_build_bindir = $(oa_builddir)/bin -oa_build_texdir = $(oa_builddir)/texmf/tex -oa_build_docdir = $(oa_builddir)/doc top_confdir = $(top_srcdir)/config @@ -2465,8 +2448,8 @@ $(DOC): $(DOC)/%.dvi: $(builddir)/%.dvi @cp -p $< $@ -$(builddir)/%.dvi: $(oa_build_texdir)/diagrams.tex \ - $(oa_build_texdir)/axiom.sty +$(builddir)/%.dvi: $(oa_target_texdir)/diagrams.tex \ + $(oa_target_texdir)/axiom.sty $(builddir)/%.dvi: $(builddir)/%.tex $(oa_hammer) --latex $< @@ -2474,7 +2457,7 @@ $(builddir)/%.dvi: $(builddir)/%.tex $(builddir)/%.tex: $(srcdir)/%.pamphlet $(oa_hammer) --weave --output=$@ $< -$(oa_build_texdir)/diagrams.tex: $(oa_src_docdir)/diagrams.tex +$(oa_target_texdir)/diagrams.tex: $(oa_src_docdir)/diagrams.tex @cp -p $< $@ $(INPUT)/TESTFR.input: $(srcdir)/fr.spad.pamphlet diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index 363a5079..d8ab6fc2 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -16,7 +16,7 @@ # Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. # All rights reserved. -# Copyright (C) 2007-2013, Gabriel Dos Reis. +# Copyright (C) 2007-2014, Gabriel Dos Reis. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -84,7 +84,6 @@ # Compile order is important. Here we try to define the ordered lattice # of spad file dependencies. However this is, in reality, a graph rather # than a lattice. -# VPATH = @srcdir@ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' am__make_running_with_option = \ @@ -522,13 +521,6 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ -oa_build_bindir = $(oa_builddir)/bin -oa_build_datadir = @oa_build_datadir@ -oa_build_docdir = $(oa_builddir)/doc -oa_build_libdir = @oa_build_libdir@ -oa_build_mandir = @oa_build_mandir@ -oa_build_texdir = $(oa_builddir)/texmf/tex -oa_builddir = $(top_builddir)/build-$(build) oa_c_macros = @oa_c_macros@ oa_c_runtime = @oa_c_runtime@ oa_c_runtime_extra = @oa_c_runtime_extra@ @@ -548,8 +540,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@ @@ -575,15 +579,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ void_type = @void_type@ -oa_targetdir = $(top_builddir)/$(target) -oa_target_bindir = $(oa_targetdir)/bin -oa_target_libdir = $(oa_targetdir)/lib -oa_target_docdir = $(oa_targetdir)/doc -oa_target_srcdir = $(oa_targetdir)/src -oa_target_datadir = $(oa_targetdir)/share -oa_src_srcdir = $(top_srcdir)/src -oa_src_docdir = $(top_srcdir)/doc -oa_src_datadir = $(oa_src_srcdir)/share top_confdir = $(top_srcdir)/config OUT = $(oa_targetdir)/algebra DOC = $(oa_target_docdir)/src/algebra @@ -3349,8 +3344,8 @@ $(DOC): $(DOC)/%.dvi: $(builddir)/%.dvi @cp -p $< $@ -$(builddir)/%.dvi: $(oa_build_texdir)/diagrams.tex \ - $(oa_build_texdir)/axiom.sty +$(builddir)/%.dvi: $(oa_target_texdir)/diagrams.tex \ + $(oa_target_texdir)/axiom.sty $(builddir)/%.dvi: $(builddir)/%.tex $(oa_hammer) --latex $< @@ -3358,7 +3353,7 @@ $(builddir)/%.dvi: $(builddir)/%.tex $(builddir)/%.tex: $(srcdir)/%.pamphlet $(oa_hammer) --weave --output=$@ $< -$(oa_build_texdir)/diagrams.tex: $(oa_src_docdir)/diagrams.tex +$(oa_target_texdir)/diagrams.tex: $(oa_src_docdir)/diagrams.tex @cp -p $< $@ $(INPUT)/TESTFR.input: $(srcdir)/fr.spad.pamphlet diff --git a/src/boot/Makefile.in b/src/boot/Makefile.in index b1634221..4433414f 100644 --- a/src/boot/Makefile.in +++ b/src/boot/Makefile.in @@ -48,7 +48,7 @@ ## entire bootstrap process. DRIVER = $(top_builddir)/src/driver/open-axiom$(EXEEXT) -AXIOM_LOCAL_LISP = ../lisp/lisp$(EXEEXT) +AXIOM_LOCAL_LISP = $(oa_target_bindir)/lisp$(EXEEXT) ## FASLs that comprises `bootsys' @@ -79,7 +79,6 @@ all-boot: $(oa_target_bindir)/bootsys$(EXEEXT) $(oa_boot_linkset) ## The final `bootsys' image. $(oa_target_bindir)/bootsys$(EXEEXT): stage2/bootsys$(EXEEXT) - $(mkdir_p) $(oa_target_bindir) cp -p $< $@ $(oa_boot_linkset): $(addprefix $(oa_target_bootdir)/, $(boot_objects)) diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in index 4267da98..0ec8f0e1 100644 --- a/src/interp/Makefile.in +++ b/src/interp/Makefile.in @@ -203,7 +203,7 @@ $(SAVESYS): database.date $(oa_target_datadir)/msgs/s2-us.msgs $(OBJS) $(oa_targ --prologue="(pushnew :open-axiom-basic-system *features*)" \ --make --output=$@ --main="BOOT::|systemMain|" \ --load-directory=. $(OBJS) - $(mkdir_p) $(oa_target_bindir) + .PHONY: all-axiomsys all-axiomsys: ${AXIOMSYS} 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: diff --git a/src/lisp/Makefile.in b/src/lisp/Makefile.in index 190142cf..cbf89c49 100644 --- a/src/lisp/Makefile.in +++ b/src/lisp/Makefile.in @@ -30,7 +30,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -OUT = $(oa_build_bindir) +OUT = $(oa_target_bindir) oa_target_lispdir = $(oa_targetdir)/lisp subdir = src/lisp/ diff --git a/src/rt/Makefile.am b/src/rt/Makefile.am index c7f32b7d..7887d6e3 100644 --- a/src/rt/Makefile.am +++ b/src/rt/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 diff --git a/src/rt/Makefile.in b/src/rt/Makefile.in index 86790856..b767e683 100644 --- a/src/rt/Makefile.in +++ b/src/rt/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@ 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: |