yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure.ac: New configure option --enable-generated-files-in-srcdir.

Browse Source 
2007-03-10  Matthias Klose  <doko@ubuntu.com> 
 
        * configure.ac: New configure option 
        --enable-generated-files-in-srcdir. 
        * doc/Makefile.am: Add support to generate files in srcdir, 
        install the cp-tools documentation in info format. 
        * configure: Regenerate. 
        * native/jni/classpath/Makefile.in, native/jni/midi-dssi/Makefile.in, 
        native/jni/Makefile.in, native/jni/gconf-peer/Makefile.in, 
        native/jni/java-io/Makefile.in, native/jni/native-lib/Makefile.in, 
        native/jni/java-util/Makefile.in, native/jni/java-lang/Makefile.in, 
        native/jni/midi-alsa/Makefile.in, native/jni/java-nio/Makefile.in, 
        native/jni/java-net/Makefile.in, native/jni/xmlj/Makefile.in, 
        native/jni/qt-peer/Makefile.in, native/jni/gtk-peer/Makefile.in, 
        native/Makefile.in, native/jawt/Makefile.in, native/fdlibm/Makefile.in, 
        native/plugin/Makefile.in, resource/Makefile.in, scripts/Makefile.in, 
        tools/Makefile.in, doc/Makefile.in, doc/api/Makefile.in, 
        lib/Makefile.in, external/Makefile.in, external/sax/Makefile.in, 
        external/w3c_dom/Makefile.in, external/jsr166/Makefile.in, 
        external/relaxngDatatype/Makefile.in, include/Makefile.in, 
        examples/Makefile.in: Regenerate.

From-SVN: r123050
This commit is contained in:
Matthias Klose
2007-03-19 05:57:53 +00:00
committed by Matthias Klose
parent c6ac6e82ac
commit fd975604c2
36 changed files with 428 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libjava/classpath/doc/Makefile.am
+47
View File
@@ -4,6 +4,9 @@ EXTRA_DIST = README.jaxp $(man_MANS)
## GCJ LOCAL: we don't want to install all of Classpath's info files.
## info_TEXINFOS = cp-hacking.texinfo cp-vmintegration.texinfo cp-tools.texinfo
TEXINFO_TEX = ../../gcc/doc/include/texinfo.tex
info_TEXINFOS = cp-tools.texinfo
cp_tools_TEXINFOS = gcc-vers.texi
%.dvi : %.texinfo
texi2dvi $<
@@ -12,6 +15,7 @@ EXTRA_DIST = README.jaxp $(man_MANS)
dvips -o $@ $<
docs: cp-hacking.ps cp-vmintegration.ps cp-tools.ps
install-data-local: install-info
man_MANS = $(TOOLS_MANFILES)
TOOLS_MANFILES = \
@@ -89,3 +93,46 @@ gserialver.pod: $(srcdir)/cp-tools.texinfo
gtnameserv.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gtnameserv < $< > $@
# GCJ LOCAL CHANGE
# The following commands allow us to release tarballs with the man pages
# and info documentation prebuilt. This feature is enabled via
# --enable-generated-files-in-srcdir in the configure script.
if GENINSRC
STAMP_GENINSRC = stamp-geninsrc
else
STAMP_GENINSRC =
endif
all-local: $(STAMP_GENINSRC)
stamp-geninsrc: $(TOOLS_MANFILES) cp-tools.info
-cp -p gappletviewer.1 $(srcdir)/gappletviewer.1
-cp -p gjar.1 $(srcdir)/gjar.1
-cp -p gjarsigner.1 $(srcdir)/gjarsigner.1
-cp -p gjavah.1 $(srcdir)/gjavah.1
-cp -p gkeytool.1 $(srcdir)/gkeytool.1
-cp -p gnative2ascii.1 $(srcdir)/gnative2ascii.1
-cp -p gorbd.1 $(srcdir)/gorbd.1
-cp -p grmid.1 $(srcdir)/grmid.1
-cp -p grmiregistry.1 $(srcdir)/grmiregistry.1
-cp -p gserialver.1 $(srcdir)/gserialver.1
-cp -p gtnameserv.1 $(srcdir)/gtnameserv.1
-cp -p cp-tools.info $(srcdir)/cp-tools.info
touch $@
CLEANFILES = stamp-geninsrc cp-tools.info
MAINTAINERCLEANFILES = \
$(srcdir)/gappletviewer.1 \
$(srcdir)/gjar.1 \
$(srcdir)/gjarsigner.1 \
$(srcdir)/gjavah.1 \
$(srcdir)/gkeytool.1 \
$(srcdir)/gnative2ascii.1 \
$(srcdir)/gorbd.1 \
$(srcdir)/grmid.1 \
$(srcdir)/grmiregistry.1 \
$(srcdir)/gserialver.1 \
$(srcdir)/gtnameserv.1 \
$(srcdir)/cp-tools.info
libjava/classpath/doc/Makefile.in
+226 -24
View File
@@ -37,7 +37,8 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
subdir = doc
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in texinfo.tex
DIST_COMMON = $(cp_tools_TEXINFOS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in texinfo.tex
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/../../config/lead-dot.m4 \
@@ -57,14 +58,26 @@ CONFIG_HEADER = $(top_builddir)/include/config.h
CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
INFO_DEPS = $(srcdir)/tools.info
am__TEXINFO_TEX_DIR = $(srcdir)/../../gcc/doc/include
DVIS = cp-tools.dvi
PDFS = cp-tools.pdf
PSS = cp-tools.ps
HTMLS = cp-tools.html
TEXINFOS = cp-tools.texinfo
TEXI2DVI = texi2dvi
TEXI2PDF = $(TEXI2DVI) --pdf --batch
MAKEINFOHTML = $(MAKEINFO) --html
AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
DVIPS = dvips
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-exec-recursive install-info-recursive \
install-recursive installcheck-recursive installdirs-recursive \
pdf-recursive ps-recursive uninstall-info-recursive \
uninstall-recursive
am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"
man1dir = $(mandir)/man1
am__installdirs = "$(DESTDIR)$(man1dir)"
NROFF = nroff
MANS = $(man_MANS)
ETAGS = etags
@@ -159,6 +172,8 @@ GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@
GDK_CFLAGS = @GDK_CFLAGS@
GDK_LIBS = @GDK_LIBS@
GENINSRC_FALSE = @GENINSRC_FALSE@
GENINSRC_TRUE = @GENINSRC_TRUE@
GJDOC = @GJDOC@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
@@ -302,6 +317,9 @@ toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
SUBDIRS = api
EXTRA_DIST = README.jaxp $(man_MANS)
TEXINFO_TEX = ../../gcc/doc/include/texinfo.tex
info_TEXINFOS = cp-tools.texinfo
cp_tools_TEXINFOS = gcc-vers.texi
man_MANS = $(TOOLS_MANFILES)
TOOLS_MANFILES = \
gappletviewer.1 \
@@ -321,9 +339,32 @@ DEVPHASE = $(top_srcdir)/../../gcc/DEV-PHASE
POD2MAN = pod2man --center="GNU" --release="gcc-$(shell cat $(BASEVER))"
TEXI2POD = perl $(top_srcdir)/../../contrib/texi2pod.pl
STAMP = echo timestamp >
@GENINSRC_FALSE@STAMP_GENINSRC =
# GCJ LOCAL CHANGE
# The following commands allow us to release tarballs with the man pages
# and info documentation prebuilt. This feature is enabled via
# --enable-generated-files-in-srcdir in the configure script.
@GENINSRC_TRUE@STAMP_GENINSRC = stamp-geninsrc
CLEANFILES = stamp-geninsrc cp-tools.info
MAINTAINERCLEANFILES = \
$(srcdir)/gappletviewer.1 \
$(srcdir)/gjar.1 \
$(srcdir)/gjarsigner.1 \
$(srcdir)/gjavah.1 \
$(srcdir)/gkeytool.1 \
$(srcdir)/gnative2ascii.1 \
$(srcdir)/gorbd.1 \
$(srcdir)/grmid.1 \
$(srcdir)/grmiregistry.1 \
$(srcdir)/gserialver.1 \
$(srcdir)/gtnameserv.1 \
$(srcdir)/cp-tools.info
all: all-recursive
.SUFFIXES:
.SUFFIXES: .dvi .html .info .pdf .ps .texinfo
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -362,7 +403,110 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
.texinfo.info:
restore=: && backupdir="$(am__leading_dot)am$$$$" && \
am__cwd=`pwd` && cd $(srcdir) && \
rm -rf $$backupdir && mkdir $$backupdir && \
if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
done; \
else :; fi && \
cd "$$am__cwd"; \
if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-o $@ $<; \
then \
rc=0; \
cd $(srcdir); \
else \
rc=$$?; \
cd $(srcdir) && \
$$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
fi; \
rm -rf $$backupdir; exit $$rc
.texinfo.dvi:
TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
$(TEXI2DVI) $<
.texinfo.pdf:
TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
$(TEXI2PDF) $<
.texinfo.html:
rm -rf $(@:.html=.htp)
if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-o $(@:.html=.htp) $<; \
then \
rm -rf $@; \
if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
else \
if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
exit 1; \
fi
$(srcdir)/tools.info: cp-tools.texinfo $(cp_tools_TEXINFOS)
tools.dvi: cp-tools.texinfo $(cp_tools_TEXINFOS)
tools.pdf: cp-tools.texinfo $(cp_tools_TEXINFOS)
tools.html: cp-tools.texinfo $(cp_tools_TEXINFOS)
.dvi.ps:
TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
$(DVIPS) -o $@ $<
uninstall-info-am:
@$(PRE_UNINSTALL)
@if (install-info --version && \
install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
list='$(INFO_DEPS)'; \
for file in $$list; do \
relfile=`echo "$$file" | sed 's|^.*/||'`; \
echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \
install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \
done; \
else :; fi
@$(NORMAL_UNINSTALL)
@list='$(INFO_DEPS)'; \
for file in $$list; do \
relfile=`echo "$$file" | sed 's|^.*/||'`; \
relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
(if cd "$(DESTDIR)$(infodir)"; then \
echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
else :; fi); \
done
dist-info: $(INFO_DEPS)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
list='$(INFO_DEPS)'; \
for base in $$list; do \
case $$base in \
$(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
esac; \
if test -f $$base; then d=.; else d=$(srcdir); fi; \
for file in $$d/$$base*; do \
relfile=`expr "$$file" : "$$d/\(.*\)"`; \
test -f $(distdir)/$$relfile || \
cp -p $$file $(distdir)/$$relfile; \
done; \
done
mostlyclean-aminfo:
-rm -rf cp-tools.aux cp-tools.cp cp-tools.cps cp-tools.fn cp-tools.fns \
cp-tools.ky cp-tools.kys cp-tools.log cp-tools.pg \
cp-tools.pgs cp-tools.tmp cp-tools.toc cp-tools.tp \
cp-tools.tps cp-tools.vr cp-tools.vrs tools.dvi tools.pdf \
tools.ps tools.html
maintainer-clean-aminfo:
@list='$(INFO_DEPS)'; for i in $$list; do \
i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \
echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \
rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
done
install-man1: $(man1_MANS) $(man_MANS)
@$(NORMAL_INSTALL)
test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
@@ -583,12 +727,15 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-info
check-am: all-am
check: check-recursive
all-am: Makefile $(MANS)
all-am: Makefile $(INFO_DEPS) $(MANS) all-local
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(man1dir)"; do \
for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-recursive
@@ -608,6 +755,7 @@ install-strip:
mostlyclean-generic:
clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -615,6 +763,7 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-recursive
clean-am: clean-generic clean-libtool mostlyclean-am
@@ -626,39 +775,73 @@ distclean-am: clean-am distclean-generic distclean-libtool \
dvi: dvi-recursive
dvi-am:
dvi-am: $(DVIS)
html: html-recursive
html-am: $(HTMLS)
info: info-recursive
info-am:
info-am: $(INFO_DEPS)
install-data-am: install-man
install-data-am: install-data-local install-info-am install-man
install-exec-am:
install-info: install-info-recursive
install-info-am: $(INFO_DEPS)
@$(NORMAL_INSTALL)
test -z "$(infodir)" || $(mkdir_p) "$(DESTDIR)$(infodir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
list='$(INFO_DEPS)'; \
for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
esac; \
if test -f $$file; then d=.; else d=$(srcdir); fi; \
file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \
for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
$$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
if test -f $$ifile; then \
relfile=`echo "$$ifile" | sed 's|^.*/||'`; \
echo " $(INSTALL_DATA) '$$ifile' '$(DESTDIR)$(infodir)/$$relfile'"; \
$(INSTALL_DATA) "$$ifile" "$(DESTDIR)$(infodir)/$$relfile"; \
else : ; fi; \
done; \
done
@$(POST_INSTALL)
@if (install-info --version && \
install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
list='$(INFO_DEPS)'; \
for file in $$list; do \
relfile=`echo "$$file" | sed 's|^.*/||'`; \
echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\
install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
done; \
else : ; fi
install-man: install-man1
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
maintainer-clean-am: distclean-am maintainer-clean-aminfo \
maintainer-clean-generic
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic mostlyclean-libtool
mostlyclean-am: mostlyclean-aminfo mostlyclean-generic \
mostlyclean-libtool
pdf: pdf-recursive
pdf-am:
pdf-am: $(PDFS)
ps: ps-recursive
ps-am:
ps-am: $(PSS)
uninstall-am: uninstall-info-am uninstall-man
@@ -666,19 +849,20 @@ uninstall-info: uninstall-info-recursive
uninstall-man: uninstall-man1
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
clean clean-generic clean-libtool clean-recursive ctags \
ctags-recursive distclean distclean-generic distclean-libtool \
distclean-recursive distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-exec install-exec-am install-info \
install-info-am install-man install-man1 install-strip \
installcheck installcheck-am installdirs installdirs-am \
maintainer-clean maintainer-clean-generic \
maintainer-clean-recursive mostlyclean mostlyclean-generic \
mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
tags tags-recursive uninstall uninstall-am uninstall-info-am \
uninstall-man uninstall-man1
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \
check-am clean clean-generic clean-libtool clean-recursive \
ctags ctags-recursive dist-info distclean distclean-generic \
distclean-libtool distclean-recursive distclean-tags distdir \
dvi dvi-am html html-am info info-am install install-am \
install-data install-data-am install-data-local install-exec \
install-exec-am install-info install-info-am install-man \
install-man1 install-strip installcheck installcheck-am \
installdirs installdirs-am maintainer-clean \
maintainer-clean-aminfo maintainer-clean-generic \
maintainer-clean-recursive mostlyclean mostlyclean-aminfo \
mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
uninstall-info-am uninstall-man uninstall-man1
%.dvi : %.texinfo
@@ -688,6 +872,7 @@ uninstall-man: uninstall-man1
dvips -o $@ $<
docs: cp-hacking.ps cp-vmintegration.ps cp-tools.ps
install-data-local: install-info
# gcc-vers.texi is generated from the version files.
gcc-vers.texi: $(BASEVER) $(DEVPHASE)
@@ -744,6 +929,23 @@ gserialver.pod: $(srcdir)/cp-tools.texinfo
gtnameserv.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gtnameserv < $< > $@
all-local: $(STAMP_GENINSRC)
stamp-geninsrc: $(TOOLS_MANFILES) cp-tools.info
-cp -p gappletviewer.1 $(srcdir)/gappletviewer.1
-cp -p gjar.1 $(srcdir)/gjar.1
-cp -p gjarsigner.1 $(srcdir)/gjarsigner.1
-cp -p gjavah.1 $(srcdir)/gjavah.1
-cp -p gkeytool.1 $(srcdir)/gkeytool.1
-cp -p gnative2ascii.1 $(srcdir)/gnative2ascii.1
-cp -p gorbd.1 $(srcdir)/gorbd.1
-cp -p grmid.1 $(srcdir)/grmid.1
-cp -p grmiregistry.1 $(srcdir)/grmiregistry.1
-cp -p gserialver.1 $(srcdir)/gserialver.1
-cp -p gtnameserv.1 $(srcdir)/gtnameserv.1
-cp -p cp-tools.info $(srcdir)/cp-tools.info
touch $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
libjava/classpath/doc/api/Makefile.in
+2
View File
@@ -148,6 +148,8 @@ GCONF_CFLAGS = @GCONF_CFLAGS@
GCONF_LIBS = @GCONF_LIBS@
GDK_CFLAGS = @GDK_CFLAGS@
GDK_LIBS = @GDK_LIBS@
GENINSRC_FALSE = @GENINSRC_FALSE@
GENINSRC_TRUE = @GENINSRC_TRUE@
GJDOC = @GJDOC@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@