File 0001-build-use-simpler-relative-path-specificat... of Package singular

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-build-use-simpler-relative-path-specifications.patch of Package singular (Revision f40b016b498bf3037922426503afa27b)

Currently displaying revision f40b016b498bf3037922426503afa27b , Show latest

From 381e689ebc0b39852e40721bb735dd07057caed7 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 2 Jan 2012 09:56:12 +0100
Subject: [PATCH] build: use simpler relative path specifications

Cosmetic only. It makes the compile lines somewhat shorter.

As for commands, builddir is always ".", so there is no need to use
${abs_builddir} or ${builddir} AFAICS.
---
 Singular/Makefile.am             |   26 +++++++++++++-------------
 dyn_modules/bigintm/Makefile.am  |    4 ++--
 dyn_modules/syzextra/Makefile.am |    4 ++--
 factory/Makefile.am              |    6 +++---
 libpolys/coeffs/Makefile.am      |    2 +-
 libpolys/polys/Makefile.am       |    2 +-
 omalloc/Makefile.am              |   16 ++++++++--------
 7 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Singular/Makefile.am b/Singular/Makefile.am
index 52a8262..2fab257 100644
--- a/Singular/Makefile.am
+++ b/Singular/Makefile.am
@@ -206,7 +206,7 @@ else
   bin_PROGRAMS = Singular ESingular TSingular $(optional_Singular_programs)
 endif
 
-AMLDFLAGS = -L${abs_top_builddir}/Singular -L${abs_top_builddir}/numeric -L${abs_top_builddir}/kernel -L${abs_top_builddir}/libpolys/polys  -L${top_builddir}/libpolys/coeffs -L${top_builddir}/libpolys/reporter -L${top_builddir}/libpolys/misc $(USE_FACTORY) -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/findexec
+AMLDFLAGS = -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel -L${top_builddir}/libpolys/polys  -L${top_builddir}/libpolys/coeffs -L${top_builddir}/libpolys/reporter -L${top_builddir}/libpolys/misc $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/findexec
 
 Singular_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
 Singularg_CFLAGS = -g ${PIPE}
@@ -220,8 +220,8 @@ nodist_Singularg_SOURCES =  libSingular_g.la
 Singular_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc  utils.h 
 Singularg_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc  utils.h 
 
-Singular_LDADD = libSingular.la ${abs_top_builddir}/numeric/libnumeric.la ${abs_top_builddir}/kernel/libkernel.la ${abs_top_builddir}/libpolys/polys/libpolys.la -lcoeffs -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lfindexec $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
-Singularg_LDADD = libSingular_g.la ${abs_top_builddir}/numeric/libnumeric_g.la ${abs_top_builddir}/kernel/libkernel_g.la ${abs_top_builddir}/libpolys/polys/libpolys_g.la -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
+Singular_LDADD = libSingular.la ${top_builddir}/numeric/libnumeric.la ${top_builddir}/kernel/libkernel.la ${top_builddir}/libpolys/polys/libpolys.la -lcoeffs -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lfindexec $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
+Singularg_LDADD = libSingular_g.la ${top_builddir}/numeric/libnumeric_g.la ${top_builddir}/kernel/libkernel_g.la ${top_builddir}/libpolys/polys/libpolys_g.la -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
 
 Singular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
 Singularg_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H 
@@ -309,8 +309,8 @@ LIB/all.lib: ${srcdir}/make_alllib.sh ${srcdir}/LIB/all.lib.tmpl ${singularlibra
 
 ########################### TEST #########################
 
-TESTS_ENVIRONMENT = SINGULARPATH='${abs_top_builddir}/Singular/LIB:${abs_top_srcdir}/Singular/LIB:${abs_top_builddir}/libpolys/polys/.libs:${abs_top_builddir}/factory/gftables'
-TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}' 
+TESTS_ENVIRONMENT = SINGULARPATH='${top_builddir}/Singular/LIB:${top_srcdir}/Singular/LIB:${top_builddir}/libpolys/polys/.libs:${top_builddir}/factory/gftables'
+TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${top_builddir}'
 
 if WANT_DEBUG
 TESTS=test-s-g test-s-r test-d-g test-d-r
@@ -369,23 +369,23 @@ BUILT_SOURCES = feOpt.inc feOptTS.inc feOptES.inc iparith.inc LIB/all.lib plural
 CLEANFILES = $(BUILT_SOURCES) $(EXTRA_PROGRAMS)
 
 feOpt.inc: feOptGen
-	${abs_builddir}/feOptGen
+	${builddir}/feOptGen
 
 feOptES.inc: feOptES
-	${abs_builddir}/feOptES
+	${builddir}/feOptES
 
 feOptTS.inc: feOptTS
-	${abs_builddir}/feOptTS
+	${builddir}/feOptTS
 
 plural_cmd.inc iparith.inc: gentable1
-	${abs_builddir}/gentable1
+	${builddir}/gentable1
 
 # # fake rule to fix parallel make http://www.gnu.org/s/hello/manual/automake/Multiple-Outputs.html
 # plural_cmd.inc: iparith.inc
 
 
-gftables: ${abs_top_srcdir}/factory/gftables
-	ln -snf ${abs_top_srcdir}/factory/gftables ${abs_builddir}/gftables
+gftables: ${top_srcdir}/factory/gftables
+	ln -snf ${top_srcdir}/factory/gftables ${builddir}/gftables
 
-MOD: ${abs_top_builddir}/libpolys/polys/.libs
-	ln -snf ${abs_top_builddir}/libpolys/polys/.libs/ ${abs_builddir}/MOD
+MOD: ${top_builddir}/libpolys/polys/.libs
+	ln -snf ${top_builddir}/libpolys/polys/.libs/ ${builddir}/MOD
diff --git a/dyn_modules/bigintm/Makefile.am b/dyn_modules/bigintm/Makefile.am
index f1b09dd..2b04909 100644
--- a/dyn_modules/bigintm/Makefile.am
+++ b/dyn_modules/bigintm/Makefile.am
@@ -30,8 +30,8 @@ $(FACTORY_CFLAGS) $(NTL_CFLAGS) $(GMP_CFLAGS)
 
 
 AMLDFLAGS	= 
-# -L${abs_top_builddir}/Singular -L${abs_top_builddir}/numeric -L${abs_top_builddir}/kernel \
-# -L${abs_top_builddir}/libpolys/polys $(USE_FACTORY) -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/findexec
+# -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel \
+# -L${top_builddir}/libpolys/polys $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/findexec
 
 
 SOURCES = mod_main.cc bigintm.cc bigintm.h
diff --git a/dyn_modules/syzextra/Makefile.am b/dyn_modules/syzextra/Makefile.am
index 2b811e2..68a59b2 100644
--- a/dyn_modules/syzextra/Makefile.am
+++ b/dyn_modules/syzextra/Makefile.am
@@ -30,8 +30,8 @@ $(FACTORY_CFLAGS) $(NTL_CFLAGS) $(GMP_CFLAGS)
 
 
 AMLDFLAGS	= 
-# -L${abs_top_builddir}/Singular -L${abs_top_builddir}/numeric -L${abs_top_builddir}/kernel \
-# -L${abs_top_builddir}/libpolys/polys $(USE_FACTORY) -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/findexec
+# -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel \
+# -L${top_builddir}/libpolys/polys $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/findexec
 
 
 SOURCES = mod_main.cc DebugPrint.cc DebugPrint.h myNF.cc myNF.h singularxx_defs.h
diff --git a/factory/Makefile.am b/factory/Makefile.am
index 964e72d..8c366dc 100644
--- a/factory/Makefile.am
+++ b/factory/Makefile.am
@@ -17,10 +17,10 @@ endif
 lib_LTLIBRARIES = libfactory.la ${LIB_G}
 
 libfactory_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${CXXTEMPLFLAGS}
-libfactory_la_LIBADD     = ${abs_builddir}/libfac/libfac.la $(FLINT_LIBS) ${GMP_LIBS} ${NTL_LIBS}
+libfactory_la_LIBADD     = ${builddir}/libfac/libfac.la $(FLINT_LIBS) ${GMP_LIBS} ${NTL_LIBS}
 libfactory_la_LDFLAGS    = -release ${PACKAGE_VERSION}
 libfactory_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${CXXTEMPLFLAGS}
-libfactory_g_la_LIBADD   = ${abs_builddir}/libfac/libfac_g.la $(FLINT_LIBS) ${GMP_LIBS} ${NTL_LIBS}
+libfactory_g_la_LIBADD   = ${builddir}/libfac/libfac_g.la $(FLINT_LIBS) ${GMP_LIBS} ${NTL_LIBS}
 libfactory_g_la_LDFLAGS  = -release ${PACKAGE_VERSION}
 
 
@@ -303,7 +303,7 @@ TESTS = test-s-r test-d-r
 endif
 check_PROGRAMS = $(TESTS)
 
-AMLDFLAGS =  -L${abs_builddir}
+AMLDFLAGS =  -L${builddir}
 
 TESTSSOURCES = test.cc
 
diff --git a/libpolys/coeffs/Makefile.am b/libpolys/coeffs/Makefile.am
index 3e08c9f..215c46b 100644
--- a/libpolys/coeffs/Makefile.am
+++ b/libpolys/coeffs/Makefile.am
@@ -50,7 +50,7 @@ else
   USE_FACTORY =
 endif
 
-AMLDFLAGS = -L${abs_top_builddir}/coeffs -L${abs_top_builddir}/reporter -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc -L${abs_top_builddir}/../findexec
+AMLDFLAGS = -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc -L${top_builddir}/../findexec
 
 TESTS_ENVIRONMENT = SINGULARPATH='${top_srcdir}/../factory:${top_builddir}/../factory'
 TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='$(top_builddir)' 
diff --git a/libpolys/polys/Makefile.am b/libpolys/polys/Makefile.am
index 88dc425..ae314ad 100644
--- a/libpolys/polys/Makefile.am
+++ b/libpolys/polys/Makefile.am
@@ -154,7 +154,7 @@ templates_p_Procs_Generate_CXXFLAGS = ${NODEBUGCXXFLAGS}
 templates_p_Procs_Generate_CPPFLAGS = ${NODEBUGDEFS} ${USE_P_PROCS_STATIC} ${AM_CPPFLAGS}
 
 templates_p_Procs_Generate_LDADD    = -lreporter -lmisc -lomalloc -lfindexec
-templates_p_Procs_Generate_LDFLAGS  = -L${abs_builddir} -L${abs_top_builddir}/coeffs -L${abs_top_builddir}/reporter -L${top_builddir}/misc -L${abs_top_builddir}/../omalloc -L${abs_top_builddir}/../findexec
+templates_p_Procs_Generate_LDFLAGS  = -L${builddir} -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/misc -L${top_builddir}/../omalloc -L${top_builddir}/../findexec
 
 templates/p_Procs.inc: templates/p_Procs_Generate
 	${builddir}/templates/p_Procs_Generate > ${builddir}/templates/p_Procs.inc
diff --git a/omalloc/Makefile.am b/omalloc/Makefile.am
index 3edf060..dd0635f 100644
--- a/omalloc/Makefile.am
+++ b/omalloc/Makefile.am
@@ -32,7 +32,7 @@ omalloc_provide.c omAllocFunc.c
 
 EXTRA_DIST = omalloc.c omtTestAlloc.c omtTest.h omMmap.c
 
-AM_CPPFLAGS =-I${abs_top_srcdir}/.. -I${abs_top_builddir}/..
+AM_CPPFLAGS =-I${top_srcdir}/.. -I${top_builddir}/..
 
 libomalloc_la_SOURCES=$(SOURCES) $(noinst_HEADERS)
 libomalloc_g_la_SOURCES=$(SOURCES) $(noinst_HEADERS)
@@ -66,7 +66,7 @@ CLEANFILES = $(BUILT_SOURCES)
 ####################################################
 ## Test program
 ##
-# AM_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc
+# AM_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc
 
 
 TESTS = omtTest-s-g omtTest-s-m omtTest-d-g omtTest-d-m
@@ -91,18 +91,18 @@ omtTest_s_g_SOURCES = $(OMTTESTSSOURCES)
 omtTest_s_g_CPPFLAGS= ${AM_CPPFLAGS} -DHAVE_CONFIG_H
 omtTest_s_g_CFLAGS  = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE}
 omtTest_s_g_LDADD   = libomalloc_g.la
-omtTest_s_g_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc -static
+omtTest_s_g_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc -static
 
 omtTest_s_m_CPPFLAGS= ${AM_CPPFLAGS} -DOM_TEST_MALLOC  -DHAVE_CONFIG_H
 omtTest_s_m_SOURCES = $(OMTTESTSSOURCES)
 omtTest_s_m_LDADD   = libomalloc_g.la
-omtTest_s_m_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc -static
+omtTest_s_m_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc -static
 
 omtTest_s_r_SOURCES = $(OMTTESTSSOURCES)
 omtTest_s_r_CPPFLAGS= ${AM_CPPFLAGS} -DOM_NDEBUG
 omtTest_s_r_CFLAGS  = -O3 ${PIPE}
 omtTest_s_r_LDADD   = libomalloc.la
-omtTest_s_r_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc -static
+omtTest_s_r_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc -static
 
 
 
@@ -110,15 +110,15 @@ omtTest_d_g_SOURCES = $(OMTTESTSSOURCES)
 omtTest_d_g_CPPFLAGS= ${AM_CPPFLAGS} -DHAVE_CONFIG_H
 omtTest_d_g_CFLAGS  = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE}
 omtTest_d_g_LDADD   = libomalloc_g.la
-omtTest_d_g_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc
+omtTest_d_g_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc
 
 omtTest_d_m_CPPFLAGS= ${AM_CPPFLAGS} -DOM_TEST_MALLOC  -DHAVE_CONFIG_H
 omtTest_d_m_SOURCES = $(OMTTESTSSOURCES)
 omtTest_d_m_LDADD   = libomalloc_g.la
-omtTest_d_m_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc
+omtTest_d_m_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc
 
 omtTest_d_r_SOURCES = $(OMTTESTSSOURCES)
 omtTest_d_r_CPPFLAGS= ${AM_CPPFLAGS} -DOM_NDEBUG
 omtTest_d_r_CFLAGS  = -O3 ${PIPE}
 omtTest_d_r_LDADD   = libomalloc.la
-omtTest_d_r_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc
+omtTest_d_r_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc
-- 
1.7.10.4

Places

File 0001-build-use-simpler-relative-path-specifications.patch of Package singular (Revision f40b016b498bf3037922426503afa27b)

Places