Set derived src and target directory variables

2 files changed, 21 insertions, 43 deletions

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