[java-atk-wrapper] revert to commit eda0e53



commit 61e0c856246b7ff3c615bd1b5130dc9502fe715a
Author: Magdalen Berns <m berns thismagpie com>
Date:   Tue Jun 30 22:56:16 2015 +0100

    revert to commit eda0e53

 wrapper/Makefile.am                         |   14 +-------------
 wrapper/org/GNOME/Accessibility/Makefile.am |    6 +++---
 2 files changed, 4 insertions(+), 16 deletions(-)
---
diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am
index b338c67..4f350f8 100644
--- a/wrapper/Makefile.am
+++ b/wrapper/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS=org
 JARFILES=java-atk-wrapper.jar
 ALL_CLASSES=org/GNOME/Accessibility/*.class
-DEP_CLASSES=$(ALL_CLASSES)
+DEP_CLASSES=$(wildcard $(ALL_CLASSES))
 
 if USER
 java_atk_wrapperdir = $(JAVA_HOME)/lib/ext
@@ -14,18 +14,6 @@ endif
 java_atk_wrapper_DATA = $(JARFILES)
 properties_DATA = accessibility.properties
 EXTRA_DIST = $(properties_DATA)
-dist-hook:
-srcdir_cnt=`echo $(srcdir) | wc -c`; \
-for file in $(ALL_CLASSES); do \
-f=`echo $$file | cut -c$$srcdir_cnt-`; \
-fdir=`dirname $$f`; \
-if test ! -d $(distdir)/$$fdir; then \
-echo "$(makeinstalldirs) $(distdir)/$$fdir"; \
-$(mkinstalldirs) $(distdir)/$$fdir; \
-fi; \
-echo "cp -p $$file $(distdir)/$$f"; \
-cp -p $$file $(distdir)/$$f; \
-done
 
 $(JARFILES) : $(DEP_CLASSES)
        $(JAR) cfm $(JARFILES) manifest.txt org/GNOME/Accessibility/*.class
diff --git a/wrapper/org/GNOME/Accessibility/Makefile.am b/wrapper/org/GNOME/Accessibility/Makefile.am
index 2a3c43a..9abf7be 100644
--- a/wrapper/org/GNOME/Accessibility/Makefile.am
+++ b/wrapper/org/GNOME/Accessibility/Makefile.am
@@ -1,4 +1,4 @@
-JAVA_SRC=$(srcdir)/*.java
+JAVA_SRC=$(wildcard $(srcdir)/*.java)
 CLASSES=$(patsubst %.java,%.class,$(JAVA_SRC))
 BUILD_CLASSES=$(patsubst $(srcdir)%,$(builddir)%,$(CLASSES)) $(builddir)/AtkWrapper.class
 
@@ -14,6 +14,6 @@ AtkWrapper.java : AtkWrapper.java.in
        CLASSPATH=$(top_srcdir)/wrapper $(JAVAC) $(JAVACFLAGS) -d $(top_builddir)/wrapper $<
 
 clean-local:
-       $(RM) $(builddir)/*.class
-       $(RM) $(builddir)/AtkWrapper.java
+       $(RM) *.class
+       $(RM) AtkWrapper.java
 


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