diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-06-02 02:01:44 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-06-02 02:01:44 +0000 |
| commit | a0008d24b284ba1846fcc6cd8406c837d75dab7d (patch) | |
| tree | 1e5236f3cb71585483e50b03051a9d90fb2e1c5e | |
| parent | 1099f184c14b0f15a777b8a44fbde9d1bf331521 (diff) | |
| download | classpath-a0008d24b284ba1846fcc6cd8406c837d75dab7d.tar.gz | |
Backport automake fix.
2008-04-16 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* m4/gcc_attribute.m4 (GCC_ATTRIBUTE): Fix cache variable name.
* tools/Makefile.am (gappletviewer, gjarsigner, gkeytool, gjar)
(gnative2ascii, gserialver, gjavah, grmiregistry, gtnameserv)
(gorbd, grmid, grmic) [!CREATE_WRAPPERS]: Add stub dependencies
for these scripts, to trick automake into hiding the respective
rules for the programs below the CREATE_WRAPPERS conditional.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | m4/gcc_attribute.m4 | 2 | ||||
| -rwxr-xr-x | tools/Makefile.am | 13 |
3 files changed, 23 insertions, 1 deletions
@@ -1,3 +1,12 @@ +2008-04-16 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + * m4/gcc_attribute.m4 (GCC_ATTRIBUTE): Fix cache variable name. + * tools/Makefile.am (gappletviewer, gjarsigner, gkeytool, gjar) + (gnative2ascii, gserialver, gjavah, grmiregistry, gtnameserv) + (gorbd, grmid, grmic) [!CREATE_WRAPPERS]: Add stub dependencies + for these scripts, to trick automake into hiding the respective + rules for the programs below the CREATE_WRAPPERS conditional. + 2008-04-18 Tom Tromey <tromey@redhat.com> * lib/gen-classlist.sh.in: Skip 'sed' steps if no vm_omitlist diff --git a/m4/gcc_attribute.m4 b/m4/gcc_attribute.m4 index f0c25722b..f332d21a6 100644 --- a/m4/gcc_attribute.m4 +++ b/m4/gcc_attribute.m4 @@ -15,7 +15,7 @@ AC_DEFUN([CACHED_TRY_COMPILE],[ dnl GCC_ATTRIBUTE(<short-label>,<cachevar>,<func-params>,<attribute>,<HAVE>,<desc>,[<true-cmds>],[<false-cmds>]) AC_DEFUN([GCC_ATTRIBUTE],[ - CACHED_TRY_COMPILE(__attribute__(($1)),cv_c_gcc_attribute_$2,, + CACHED_TRY_COMPILE(__attribute__(($1)),gcc_cv_c_gcc_attribute_$2,, [extern int testfunction($3) __attribute__(($4))], AC_MSG_RESULT(yes) AC_DEFINE(HAVE_GNUC25_$5,,$6) diff --git a/tools/Makefile.am b/tools/Makefile.am index e3d0d8871..12c823b62 100755 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -85,6 +85,19 @@ bin_SCRIPTS = gappletviewer gjarsigner gkeytool \ gjar gnative2ascii gserialver gjavah grmiregistry \ gtnameserv gorbd grmid grmic bin_PROGRAMS = +## FIXME: revisit this with a newer automake. +gappletviewer: gappletviewer.in +gjarsigner: gjarsigner.in +gkeytool: gkeytool.in +gjar: gjar.in +gnative2ascii: gnative2ascii.in +gserialver: gserialver.in +gjavah: gjavah.in +grmiregistry: grmiregistry.in +gtnameserv: gtnameserv.in +gorbd: gorbd.in +grmid: grmid.in +grmic: grmic.in endif EXTRA_DIST = toolwrapper.c gappletviewer.in gjarsigner.in gkeytool.in \ gjar.in gnative2ascii.in gserialver.in gjavah.in grmiregistry.in \ |