From c8a08ab33aeb6a079432b268ceadb1260e075942 Mon Sep 17 00:00:00 2001
From: gombasg <gombasg@a7169a2c-3604-0410-bc95-c702d8d87f7a>
Date: Tue, 20 Mar 2007 12:41:59 +0000
Subject: [PATCH] More 'make distcheck' fixes

git-svn-id: svn+ssh://cvs.lpds.sztaki.hu/var/lib/svn/szdg/dcapi/trunk@1052 a7169a2c-3604-0410-bc95-c702d8d87f7a
---
 dcapi/java/Makefile.am  | 12 ++++++------
 dcapi/local/Makefile.am |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dcapi/java/Makefile.am b/dcapi/java/Makefile.am
index 2d431a039e..ca8b93551b 100644
--- a/dcapi/java/Makefile.am
+++ b/dcapi/java/Makefile.am
@@ -89,7 +89,7 @@ libdc_java_client_la_DEPENDENCIES = jni_export.sym
 
 # jni_proto.h contains both the consumer and producer-side JNI prototypes
 jni_proto.h: $(JARFILES)
-	$(JAVAH) -classpath $(CLIENT_JAR):$(PRODUCER_JAR) -o $@ -jni $(CLIENT_CLASSNAMES) $(PRODUCER_CLASSNAMES)
+	$(JAVAH) -classpath $(COMMON_JAR):$(CLIENT_JAR) -o $@ -jni $(COMMON_CLASSNAMES) $(CLIENT_CLASSNAMES)
 	-touch $@
 
 # Generate the list of to-be-exported symbols from jni_proto.h
@@ -116,8 +116,8 @@ EXTRA_DIST = \
 		$(DOCFILES)
 
 MOSTLYCLEANFILES = \
+		$(COMMON_CLASSES) \
 		$(CLIENT_CLASSES) \
-		$(PRODUCER_CLASSES) \
 		$(JARFILES) \
 		javacore.txt \
 		core.*
@@ -131,13 +131,13 @@ CLEANFILES = \
 #######################################################################
 # Build and install the API documentation
 
-TARGET_DIR = $(DOC_DIR)/java
+TARGET_DIR = $(docdir)/java
 
 doc.stamp: classnoinst.stamp $(DOCFILES)
 	-mkdir $(top_builddir)/java/doc 2>/dev/null
 	$(JAVADOC) -quiet -d $(top_builddir)/java/doc \
 		-sourcepath $(srcdir) \
-		-classpath $(CLIENT_JAR):$(PRODUCER_JAR) \
+		-classpath $(COMMON_JAR):$(CLIENT_JAR) \
 		-overview $(srcdir)/$(CLASSDIR)/overview.html \
 		hu.sztaki.lpds.dc
 	-touch $@
@@ -148,8 +148,8 @@ clean-local:
 	-rm -rf doc
 
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(DOC_DIR)/java/$(CLASSDIR)
-	$(mkinstalldirs) $(DESTDIR)$(DOC_DIR)/java/$(CLASSDIR)/producer
+	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/$(CLASSDIR)
+	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/$(CLASSDIR)/producer
 	(installfiles=`echo $(srcdir)/doc/*.html $(srcdir)/doc/*.css`; \
 	if test "$$installfiles" = '$(srcdir)/doc/*.html $(srcdir)/doc/*.css'; \
 	then echo '-- Nothing to install' ; \
diff --git a/dcapi/local/Makefile.am b/dcapi/local/Makefile.am
index 114db794c1..491c9a3365 100644
--- a/dcapi/local/Makefile.am
+++ b/dcapi/local/Makefile.am
@@ -16,6 +16,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
 noinst_HEADERS = \
 		local_common.h \
 		local_master.h \
+		local_result.h \
 		local_utils.h \
 		local_wu.h