|
From: <sv...@va...> - 2005-09-16 04:16:20
|
Author: njn
Date: 2005-09-16 05:16:18 +0100 (Fri, 16 Sep 2005)
New Revision: 4669
Log:
Fixed "make distcheck", and VPATH builds, backported from main trunk, plu=
s=20
an additional change to fix the path to valt_load_address.lds. It's not
all working yet, but should be soon, hopefully.
Modified:
branches/ASPACEM/Makefile.tool.am
branches/ASPACEM/configure.in
branches/ASPACEM/docs/Makefile.am
branches/ASPACEM/docs/xml/Makefile.am
branches/ASPACEM/memcheck/tests/Makefile.am
Modified: branches/ASPACEM/Makefile.tool.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/Makefile.tool.am 2005-09-16 03:59:37 UTC (rev 4668)
+++ branches/ASPACEM/Makefile.tool.am 2005-09-16 04:16:18 UTC (rev 4669)
@@ -27,6 +27,6 @@
TOOL_LINKFLAGS =3D \
-static \
-Wl,-defsym,valt_load_address=3D@VALT_LOAD_ADDRESS@ \
- -Wl,-T,$(top_srcdir)/valt_load_address.lds \
+ -Wl,-T,$(top_builddir)/valt_load_address.lds \
-nodefaultlibs -nostartfiles -u _start
=20
Modified: branches/ASPACEM/configure.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/configure.in 2005-09-16 03:59:37 UTC (rev 4668)
+++ branches/ASPACEM/configure.in 2005-09-16 04:16:18 UTC (rev 4669)
@@ -20,7 +20,7 @@
[AC_MSG_ERROR([Directory '$withval' does not exist, or does not =
contain Vex])])
],
[
- VEX_DIR=3D`pwd`/VEX
+ VEX_DIR=3D'$(top_srcdir)/VEX'
])
AC_SUBST(VEX_DIR)
=20
Modified: branches/ASPACEM/docs/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/docs/Makefile.am 2005-09-16 03:59:37 UTC (rev 4668)
+++ branches/ASPACEM/docs/Makefile.am 2005-09-16 04:16:18 UTC (rev 4669)
@@ -24,13 +24,13 @@
##-------------------------------------------------------------------
## Below here is more ordinary make stuff...
##-------------------------------------------------------------------
-docdir =3D ./
-xmldir =3D $(docdir)xml
-imgdir =3D $(docdir)images
-libdir =3D $(docdir)lib
-htmldir =3D $(docdir)html
-printdir =3D $(docdir)print
+myxmldir =3D $(top_srcdir)/docs/xml
+myimgdir =3D $(top_srcdir)/docs/images
+mylibdir =3D $(top_srcdir)/docs/lib
=20
+myhtmldir =3D $(top_builddir)/docs/html
+myprintdir =3D $(top_builddir)/docs/print
+
XML_CATALOG_FILES =3D /etc/xml/catalog
=20
# file to log print output to
@@ -47,40 +47,40 @@
XSLTPROC_FLAGS =3D --nonet --xinclude=20
=20
# stylesheets
-XSL_HTML_CHUNK_STYLE =3D $(libdir)/vg-html-chunk.xsl
-XSL_HTML_SINGLE_STYLE =3D $(libdir)/vg-html-single.xsl
-XSL_FO_STYLE =3D $(libdir)/vg-fo.xsl
+XSL_HTML_CHUNK_STYLE =3D $(mylibdir)/vg-html-chunk.xsl
+XSL_HTML_SINGLE_STYLE =3D $(mylibdir)/vg-html-single.xsl
+XSL_FO_STYLE =3D $(mylibdir)/vg-fo.xsl
=20
all-docs: html-docs print-docs
=20
valid:
- $(XMLLINT) $(XMLLINT_FLAGS) $(xmldir)/index.xml
+ $(XMLLINT) $(XMLLINT_FLAGS) $(myxmldir)/index.xml
=20
# chunked html
html-docs:
@echo "Generating html files..."
export XML_CATALOG_FILES=3D$(XML_CATALOG_FILES) && \
- mkdir -p $(htmldir) && \
- /bin/rm -fr $(htmldir)/ && \
- mkdir -p $(htmldir)/ && \
- mkdir -p $(htmldir)/images && \
- cp $(libdir)/vg_basic.css $(htmldir)/ && \
- cp $(imgdir)/*.png $(htmldir)/images && \
- $(XSLTPROC) $(XSLTPROC_FLAGS) -o $(htmldir)/ $(XSL_HTML_CHUNK_STYLE) $(=
xmldir)/index.xml
+ mkdir -p $(myhtmldir) && \
+ /bin/rm -fr $(myhtmldir)/ && \
+ mkdir -p $(myhtmldir)/ && \
+ mkdir -p $(myhtmldir)/images && \
+ cp $(mylibdir)/vg_basic.css $(myhtmldir)/ && \
+ cp $(myimgdir)/*.png $(myhtmldir)/images && \
+ $(XSLTPROC) $(XSLTPROC_FLAGS) -o $(myhtmldir)/ $(XSL_HTML_CHUNK_STYLE) =
$(myxmldir)/index.xml
=20
# pdf and postscript
print-docs:
- @echo "Generating PDF file: $(printdir)/index.pdf (please be patient)..=
.";
+ @echo "Generating PDF file: $(myprintdir)/index.pdf (please be patient)=
...";
export XML_CATALOG_FILES=3D$(XML_CATALOG_FILES) && \
- mkdir -p $(printdir) && \
- mkdir -p $(printdir)/images && \
- cp $(imgdir)/massif-graph-sm.png $(printdir)/images && \
- $(XSLTPROC) $(XSLTPROC_FLAGS) -o $(printdir)/index.fo $(XSL_FO_STYLE) $=
(xmldir)/index.xml && \
- (cd $(printdir) && \
+ mkdir -p $(myprintdir) && \
+ mkdir -p $(myprintdir)/images && \
+ cp $(myimgdir)/massif-graph-sm.png $(myprintdir)/images && \
+ $(XSLTPROC) $(XSLTPROC_FLAGS) -o $(myprintdir)/index.fo $(XSL_FO_STYLE)=
$(myxmldir)/index.xml && \
+ (cd $(myprintdir) && \
( pdfxmltex index.fo && \
pdfxmltex index.fo && \
pdfxmltex index.fo ) &> $(LOGFILE) && \
- echo "Generating PS file: $(printdir)/index.ps ..." && \
+ echo "Generating PS file: $(myprintdir)/index.ps ..." && \
pdftops index.pdf && \
rm -f *.log *.aux *.fo *.out)
=20
Modified: branches/ASPACEM/docs/xml/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/docs/xml/Makefile.am 2005-09-16 03:59:37 UTC (rev 46=
68)
+++ branches/ASPACEM/docs/xml/Makefile.am 2005-09-16 04:16:18 UTC (rev 46=
69)
@@ -1,10 +1,11 @@
EXTRA_DIST =3D \
+ FAQ.xml \
+ dist-docs.xml \
index.xml \
- FAQ.xml \
+ licenses.xml \
manual.xml manual-intro.xml manual-core.xml \
+ quick-start-guide.xml \
writing-tools.xml \
- dist-docs.xml \
tech-docs.xml \
- licenses.xml \
vg-entities.xml \
xml_help.txt
Modified: branches/ASPACEM/memcheck/tests/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/memcheck/tests/Makefile.am 2005-09-16 03:59:37 UTC (=
rev 4668)
+++ branches/ASPACEM/memcheck/tests/Makefile.am 2005-09-16 04:16:18 UTC (=
rev 4669)
@@ -135,8 +135,8 @@
=20
# Valgrind unit self-tests
hello_LDFLAGS =3D -Wl,-defsym,valt_load_address=3D0x50000000 \
- -Wl,-T,$(top_srcdir)/valt_load_address.lds
-hello_DEPENDENCIES =3D $(top_srcdir)/valt_load_address.lds
+ -Wl,-T,$(top_builddir)/valt_load_address.lds
+hello_DEPENDENCIES =3D $(top_builddir)/valt_load_address.lds
=20
# vgtest_ume is not working
#vgtest_ume_CFLAGS =3D -DVGA_$(VG_ARCH) -DVGO_$(VG_OS)
|