diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-11-12 20:55:13 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-11-12 20:55:13 +0000 |
| commit | 3cc72d2604eea4a90ce5e33765769cef55b3c48c (patch) | |
| tree | 6785b58cfdd6121c5789e7ff48659fa27fa86f0c /libjava/Makefile.am | |
| parent | 0c4abe5bf270c0a67b78818b69d273beb532ad26 (diff) | |
| download | gcc-3cc72d2604eea4a90ce5e33765769cef55b3c48c.tar.gz | |
PR libgcj/33764
libjava/
* configure.ac (INSTALL_BINARIES): New AM_CONDITIONAL.
* Makefile.am: If not INSTALL_BINARIES, use noinst_PROGRAMS
instead of bin_PROGRAMS for binaries.
* configure: Regenerated.
* Makefile.in: Regenerated.
libjava/classpath/
* configure.ac (INSTALL_BINARIES): New AM_CONDITIONAL.
* tools/Makefile.am: If not INSTALL_BINARIES, use noinst_PROGRAMS
instead of bin_PROGRAMS for binaries.
* configure: Regenerated.
* tools/Makefile.in: Regenerated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@141801 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 0132db37d49..e3ed9b9b24a 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -79,11 +79,18 @@ db_pathtail = $(gcjsubdir)/$(db_name) ## For now, only on native systems. FIXME. if NATIVE -bin_PROGRAMS = jv-convert gij grmic grmiregistry gcj-dbtool \ +bin_programs = jv-convert gij grmic grmiregistry gcj-dbtool \ gappletviewer gjarsigner gkeytool gjar gcjh gjavah gnative2ascii \ gorbd grmid gserialver gtnameserv gc-analyze if CREATE_GJDOC -bin_PROGRAMS += gjdoc +bin_programs += gjdoc +endif + +noinst_PROGRAMS = +if INSTALL_BINARIES +bin_PROGRAMS = $(bin_programs) +else +noinst_PROGRAMS += $(bin_programs) endif ## It is convenient to actually build and install the default database @@ -734,7 +741,7 @@ write-entries-to-file-check: ## systems. if NATIVE if MAINTAINER_MODE -noinst_PROGRAMS = gen-from-JIS +noinst_PROGRAMS += gen-from-JIS gen_from_JIS_SOURCES = \ gnu/gcj/convert/gen-from-JIS.c \ |