File singular-avoid-abspath.diff of Package singular

Overview Repositories Revisions Requests Users Attributes Meta

File singular-avoid-abspath.diff of Package singular (Revision a2434fc071129b8f8dda39ed11ee29ca)

Currently displaying revision a2434fc071129b8f8dda39ed11ee29ca , Show latest

parent 0fc4c8bd0177d4673beebe5a386cd69e4161f080 ()
commit 25b6c088165b989f423de74cdee9d30fa04c99fe
Author: Jan Engelhardt <jengelh@medozas.de>
Date:   Mon Jan 2 09:56:12 2012 +0100

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       |   12 ++++++------
 factory/Makefile.am        |    2 +-
 libpolys/polys/Makefile.am |    8 ++++----
 omalloc/Makefile.am        |   16 ++++++++--------
 4 files changed, 19 insertions(+), 19 deletions(-)

Index: Source/Singular/Makefile.am
===================================================================
--- Source.orig/Singular/Makefile.am
+++ Source/Singular/Makefile.am
@@ -177,7 +177,7 @@ endif
 #########################################################
 # handle all the generated *.inc
 
-AM_LDFLAGS = -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
+AM_LDFLAGS = -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
 
 noinst_PROGRAMS = gentable2 gentable1 feOpt feOptES feOptTS
 
@@ -321,20 +321,20 @@ MOD: ${top_builddir}/libpolys/tests/MOD
 	ln -snf ${top_builddir}/libpolys/tests/MOD ${builddir}/MOD
 
 feOpt.inc: feOpt
-	${abs_builddir}/feOpt
+	./feOpt
 
 feOptES.inc: feOptES
-	${abs_builddir}/feOptES
+	./feOptES
 
 feOptTS.inc: feOptTS
-	${abs_builddir}/feOptTS
+	./feOptTS
 
 plural_cmd.inc iparith.inc: gentable1
-	${abs_builddir}/gentable1
+	./gentable1
 
 # fake rule to fix parallel make http://www.gnu.org/s/hello/manual/automake/Multiple-Outputs.html
 plural_cmd.inc: iparith.inc
 
 mpsr_Tok.inc: gentable2
-	${abs_builddir}/gentable2
+	./gentable2
 
Index: Source/factory/Makefile.am
===================================================================
--- Source.orig/factory/Makefile.am
+++ Source/factory/Makefile.am
@@ -313,7 +313,7 @@ CLEANFILES = $(BUILT_SOURCES)
 cplusplus_SOURCES = cplusplus.cc
 
 cplusplus.h: cplusplus
-	${abs_builddir}/cplusplus > ${abs_builddir}/cplusplus.h
+	./cplusplus >cplusplus.h
 
 .template.h:
 	${srcdir}/bin/makeheader $< $@
Index: Source/libpolys/polys/Makefile.am
===================================================================
--- Source.orig/libpolys/polys/Makefile.am
+++ Source/libpolys/polys/Makefile.am
@@ -9,8 +9,8 @@ NODEBUGDEFS = -DNDEBUG -DOM_NDEBUG
 AM_CFLAGS	= ${PIPE}
 AM_CXXFLAGS	= ${PIPE} ${CXXTEMPLFLAGS}
 
-INCLUDES	= -I${abs_top_srcdir} -I${abs_top_srcdir}/.. -I${abs_top_builddir} -I${abs_top_builddir}/.. -I${srcdir} -I${includedir} ${GMP_CFLAGS}
-AM_LDFLAGS	= -L${abs_top_builddir}/coeffs -L${abs_top_builddir}/reporter -L${abs_top_builddir}/resources -L${abs_top_builddir}/../omalloc -L${abs_builddir}
+INCLUDES	= -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} -I${includedir} ${GMP_CFLAGS}
+AM_LDFLAGS	= -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/resources -L${top_builddir}/../omalloc -L${builddir}
 
 if ENABLE_P_PROCS_STATIC
   USE_P_PROCS_STATIC_CC = templates/p_Procs_Static.cc
@@ -134,8 +134,8 @@ libpolys_g_la_CXXFLAGS = ${DEBUGCXXFLAGS
 libpolys_la_CPPFLAGS = ${NODEBUGDEFS}
 
 
-libpolys_la_LIBADD = ${abs_top_builddir}/misc/libmisc.la ${abs_top_builddir}/reporter/libreporter.la ${abs_top_builddir}/resources/libresources.la ${abs_top_builddir}/coeffs/libcoeffs.la
-libpolys_g_la_LIBADD = ${abs_top_builddir}/misc/libmisc_g.la ${abs_top_builddir}/reporter/libreporter_g.la ${abs_top_builddir}/resources/libresources_g.la ${abs_top_builddir}/coeffs/libcoeffs_g.la
+libpolys_la_LIBADD = ${top_builddir}/misc/libmisc.la ${top_builddir}/reporter/libreporter.la ${top_builddir}/resources/libresources.la ${top_builddir}/coeffs/libcoeffs.la
+libpolys_g_la_LIBADD = ${top_builddir}/misc/libmisc_g.la ${top_builddir}/reporter/libreporter_g.la ${top_builddir}/resources/libresources_g.la ${top_builddir}/coeffs/libcoeffs_g.la
 
 
 #################################################
Index: Source/omalloc/Makefile.am
===================================================================
--- Source.orig/omalloc/Makefile.am
+++ Source/omalloc/Makefile.am
@@ -26,7 +26,7 @@ omalloc_provide.c omAllocFunc.c
 
 EXTRA_DIST = omalloc.c omtTestAlloc.c omtTest.h omMmap.c
 
-INCLUDES=-I${abs_top_srcdir}/.. -I${abs_top_builddir}/..
+INCLUDES=-I${top_srcdir}/.. -I${top_builddir}/..
 
 libomalloc_la_SOURCES=$(SOURCES) $(noinst_HEADERS)
 libomalloc_g_la_SOURCES=$(SOURCES) $(noinst_HEADERS)
@@ -55,7 +55,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-s-r omtTest-d-g omtTest-d-m omtTest-d-r
@@ -67,18 +67,18 @@ omtTest_s_g_SOURCES = $(OMTTESTSSOURCES)
 omtTest_s_g_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 = -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 = -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
 
 
 
@@ -86,15 +86,15 @@ omtTest_d_g_SOURCES = $(OMTTESTSSOURCES)
 omtTest_d_g_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 = -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 = -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

Places

File singular-avoid-abspath.diff of Package singular (Revision a2434fc071129b8f8dda39ed11ee29ca)

Places