[Kde-bindings] [r439924] $< vs $*.java broke srcdir != objdir compilation for dcopjava

[Richard Dale]

On Sunday 19 March 2006 21:12, Adeodato Simó wrote:
> Hi,
>
>   it seems that r439924 broke srcdir != objdir for dcopjava:
>
> --- branches/KDE/3.5/kdebindings/dcopjava/binding/org/kde/DCOP/Makefile.am 
>     (revision 439923) +++
> branches/KDE/3.5/kdebindings/dcopjava/binding/org/kde/DCOP/Makefile.am     
> (revision 439924) @@ -3,6 +3,6 @@
>
>  SUFFIXES = .java .class
>  .java.class:
> -       CLASSPATH=$(top_srcdir)/dcopjava/binding $(JAVAC) -d ../../../ $<
> +       CLASSPATH=$(top_srcdir)/dcopjava/binding $(JAVAC) -d ../../../
> $*.java
>
>   The $< substitution variable includes all the path, while with $*.java
>   the path is lost and the compiler can't find the input file.
>
>   The commit log says this was done to unbreak unsermake compilations,
>   perhaps there's another way this can be solved?
Oops! It looks like one of my commits. When I looked at my local version it's 
different to the one in the svn:

baldhead duke 515% svn diff Makefile.am
Index: Makefile.am
===================================================================
--- Makefile.am (revision 504089)
+++ Makefile.am (working copy)
@@ -2,7 +2,8 @@
 classdir = $(kde_libraries)/java/org/kde/DCOP

 SUFFIXES = .java .class
+
 .java.class:
-       CLASSPATH=$(top_srcdir)/dcopjava/binding $(JAVAC) -d ../../../ $*.java
+       CLASSPATH=$(top_srcdir)/dcopjava/binding  $(JAVAC) -d ../../../ 
-cp ../../../ $(top_srcdir)/dcopjava/binding/org/kde/DCOP/$*.java

 CLEANFILES = $(class_DATA)


So is that the fix, and I just forgot to check it in?

-- Richard