Hi Audrius, On Wed, 2006-02-08 at 07:35 +0000, Audrius Meskauskas wrote: > Added files: > tools/gnu/classpath/tools/giop/grmic/templates: StubMethod.jav > TieMethod.jav > TieMethodVoid.jav > Tie.jav Stub.jav > ImplTie.jav > StubMethodVoid.jav > tools/gnu/classpath/tools/giop/grmic: Generator.java > CompilationError.java > GiopRmicCompiler.java > GiopIo.java > MethodGenerator.java > tools/gnu/classpath/tools/giop: GRMIC.txt GRMIC.java README > tools : Makefile.am Makefile.in Makefile
The Makefile and Makefile.in should not be in CVS, but should be
generated by the autogen.sh script.
> Log message:
> 2006-02-07 Audrius Meskauskas <[EMAIL PROTECTED]>
>
> * .classpath: New source patch (tools).
> * Makefile.am (SUBDIRS, DIST_SUBDIRS): added "tools".
> * configure.ac (AC_CONFIG_FILES): added tools/Makefile
> * gnu/classpath/tools/Makefile.am,
> gnu/classpath/tools/giop/GRMIC.java
> gnu/classpath/tools/giop/GRMIC.txt,
> gnu/classpath/tools/giop/README,
> gnu/classpath/tools/giop/grmic/CompilationError.java,
> gnu/classpath/tools/giop/grmic/Generator.java,
> gnu/classpath/tools/giop/grmic/GiopIo.java,
> gnu/classpath/tools/giop/grmic/GiopRmicCompiler.java,
> gnu/classpath/tools/giop/grmic/MethodGenerator.java,
> gnu/classpath/tools/giop/grmic/templates/ImplTie.jav,
> gnu/classpath/tools/giop/grmic/templates/Stub.jav,
> gnu/classpath/tools/giop/grmic/templates/StubMethod.jav,
> gnu/classpath/tools/giop/grmic/templates/StubMethodVoid.jav,
> gnu/classpath/tools/giop/grmic/templates/Tie.jav,
> gnu/classpath/tools/giop/grmic/templates/TieMethod.jav,
> gnu/classpath/tools/giop/grmic/templates/TieMethodVoid.jav: New files.
The files were actually checked into tools/gnu/classpath/tools/... (note
the starting tools/). Which is good. But the ChangeLog entry is wrong.
Unfortunately neither the checked in Makefile(.in) nor the Makefile.am
actually work. The Makefile(.in) files refer to a file README, which
isn't in the tools directory. The Makefile.am produces a Makefile(.in)
which tries to install a tools/gnu/classpath/tools/giop/README.txt which
is also not there. I didn't study the patch carefully yet. I just made
this patch to make the build work again:
2006-02-08 Mark Wielaard <[EMAIL PROTECTED]>
* tools/Makefile.am (READMES): Change README.txt to README.
* tools/Makefile.in: Removed.
* tools/Makefile: Removed.
You have to rerun autogen.sh and configure for it to work.
Cheers,
Mark
--- tools/Makefile.am
+++ tools/Makefile.am
@@ -34,7 +34,7 @@
TOOLS_HELPS = $(srcdir)/gnu/classpath/tools/giop/*.txt
# The tool specific README files.
-READMES = $(srcdir)/gnu/classpath/tools/giop/README.txt
+READMES = $(srcdir)/gnu/classpath/tools/giop/README
# All the files we find "interesting"
ALL_TOOLS_FILES = $(TOOLS_JAVA_FILES) $(TOOLS_TEMPLATES) $(READMES)
signature.asc
Description: This is a digitally signed message part
