r23038 - gnucash/trunk/src/report - Report test makefiles: avoid extra softlinks for out-of-tree building

[Geert Janssens]

Author: gjanssens
Date: 2013-06-05 09:28:41 -0400 (Wed, 05 Jun 2013)
New Revision: 23038
Trac: http://svn.gnucash.org/trac/changeset/23038

Modified:
   gnucash/trunk/src/report/report-system/test/Makefile.am
   gnucash/trunk/src/report/standard-reports/test/Makefile.am
Log:
Report test makefiles: avoid extra softlinks for out-of-tree building

These are not necessary when the softlinks are created
directly to the original scm module files in the source directory.

Modified: gnucash/trunk/src/report/report-system/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-system/test/Makefile.am	2013-06-04 21:28:45 UTC (rev 23037)
+++ gnucash/trunk/src/report/report-system/test/Makefile.am	2013-06-05 13:28:41 UTC (rev 23038)
@@ -73,21 +73,10 @@
 	$(TESTS_ENVIRONMENT) libtool --mode execute gdb test-link-module
 
 
-if GNUCASH_SEPARATE_BUILDDIR
-SCM_FILE_LINKS = \
-	$(SCM_TEST_HELPERS) \
-	$(SCM_TEST_SRCS)
-endif
-
 .scm-links:
 	$(RM) -rf gnucash
 	mkdir -p  gnucash/report/report-system/test
-if GNUCASH_SEPARATE_BUILDDIR
-	for X in ${SCM_FILE_LINKS} ; do \
-	  $(LN_S) -f ${srcdir}/$$X . ; \
-	done
-endif
-	( cd gnucash/report/report-system/test; for A in $(SCM_TEST_HELPERS) ; do $(LN_S) -f ../../../../$$A . ; done )
+	( cd gnucash/report/report-system/test; for A in $(SCM_TEST_HELPERS) ; do $(LN_S) -f $(abs_srcdir)/$$A . ; done )
 if ! OS_WIN32
 # Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567).
 	touch .scm-links
@@ -98,4 +87,4 @@
 
 noinst_DATA = .scm-links
 CLEANFILES = .scm-links
-DISTCLEANFILES = ${SCM_FILE_LINKS} $(SCM_TESTS)
+DISTCLEANFILES = $(SCM_TESTS)

Modified: gnucash/trunk/src/report/standard-reports/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/standard-reports/test/Makefile.am	2013-06-04 21:28:45 UTC (rev 23037)
+++ gnucash/trunk/src/report/standard-reports/test/Makefile.am	2013-06-05 13:28:41 UTC (rev 23038)
@@ -60,22 +60,10 @@
 	$(SCM_TEST_HELPERS) \
 	$(SCM_TEST_SRCS)
 
-if GNUCASH_SEPARATE_BUILDDIR
-#For executing test cases
-SCM_FILE_LINKS = \
-	$(SCM_TEST_HELPERS) \
-	$(SCM_TEST_SRCS)
-endif
-
 .scm-links:
 	$(RM) -rf gnucash
 	mkdir -p  gnucash/report/standard-reports/test
-if GNUCASH_SEPARATE_BUILDDIR
-	for X in ${SCM_FILE_LINKS} ; do \
-	  $(LN_S) -f ${srcdir}/$$X . ; \
-	done
-endif
-	( cd gnucash/report/standard-reports/test; for A in $(SCM_TEST_HELPERS) ; do $(LN_S) -f ../../../../$$A . ; done )
+	( cd gnucash/report/standard-reports/test; for A in $(SCM_TEST_HELPERS) ; do $(LN_S) -f $(abs_srcdir)/$$A . ; done )
 if ! OS_WIN32
 # Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567).
 	touch .scm-links
@@ -92,5 +80,5 @@
 
 noinst_DATA = .scm-links
 CLEANFILES = .scm-links *.log
-DISTCLEANFILES = ${SCM_FILE_LINKS} $(SCM_TESTS)
+DISTCLEANFILES = $(SCM_TESTS)