[java-atk-wrapper] Fixed build dependency problem



commit 32fc33807375a8be2914c60015f627b1c7d149c1
Author: Ke Wang <ke wang sun com>
Date:   Thu Jun 25 14:29:32 2009 +0800

    Fixed build dependency problem

 wrapper/Makefile.am                         |    5 ++---
 wrapper/org/GNOME/Accessibility/Makefile.am |    5 +++--
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am
index 9fd376f..949892b 100644
--- a/wrapper/Makefile.am
+++ b/wrapper/Makefile.am
@@ -1,7 +1,6 @@
 SUBDIRS=org
 JARFILES=java-atk-wrapper.jar
-CLASSES=$(wildcard $(srcdir)/org/GNOME/*/*.class)
-JAVA_FILES=$(wildcard $(srcdir)/org/GNOME/*/*.java)
+DEP_CLASSES=$(wildcard org/GNOME/Accessibility/*.class)
 
 java_atk_wrapperdir = $(prefix)/share/jar
 java_atk_wrapper_DATA = $(JARFILES)
@@ -11,7 +10,7 @@ EXTRA_DIST = $(properties_DATA)
 propertiesdir = $(prefix)/share/jar
 properties_DATA = accessibility.properties
 
-$(JARFILES) :
+$(JARFILES) : $(DEP_CLASSES)
 	$(JAR) cf $(JARFILES) org/GNOME/Accessibility/*.class
 
 all-local : $(DATA) $(JARFILES)
diff --git a/wrapper/org/GNOME/Accessibility/Makefile.am b/wrapper/org/GNOME/Accessibility/Makefile.am
index 8aa2402..6f81f12 100644
--- a/wrapper/org/GNOME/Accessibility/Makefile.am
+++ b/wrapper/org/GNOME/Accessibility/Makefile.am
@@ -1,9 +1,10 @@
 JAVA_SRC=$(wildcard $(srcdir)/*.java)
-CLASSES=$(patsubst $(srcdir)/%.java,%.class,$(JAVA_SRC))
+CLASSES=$(patsubst %.java,%.class,$(JAVA_SRC))
+BUILD_CLASSES=$(patsubst $(srcdir)%,$(builddir)%,$(CLASSES))
 
 EXTRA_DIST=$(JAVA_SRC)
 
-all-local: $(CLASSES)
+all-local: $(BUILD_CLASSES)
 
 %.class : $(srcdir)/%.java
 	CLASSPATH=$(top_srcdir)/wrapper $(JAVAC) -d $(top_builddir)/wrapper $<



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]