X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=bindings%2FMakefile.am;h=fb68657c777b55f93487cd6a47ea58ee9eeee783;hb=9ae4ff9053e3ae8923db028b75669fcda19eb4ae;hp=16872e88e2159dd4b3db58cc72377a93ccc4f30d;hpb=c89c9b7b5e498e5a77c6eb1b1a88593fcced85f5;p=collectd.git

diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index 16872e88..fb68657c 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -1,24 +1,34 @@
-EXTRA_DIST = perl/Collectd.pm perl/Makefile.PL perl/Collectd/Makefile.PL perl/Collectd/Unixsock.pm
+SUBDIRS =
+
+if BUILD_WITH_JAVA
+SUBDIRS += java
+endif
+
+EXTRA_DIST = perl/Collectd.pm perl/Makefile.PL perl/Collectd/Makefile.PL \
+		perl/Collectd/Unixsock.pm
 
 all-local: @PERL_BINDINGS@
 
 install-exec-local:
-	[ ! -f perl/Makefile ] || $(MAKE) -C perl install
+	[ ! -f perl/Makefile ] || ( cd perl && $(MAKE) install )
 
 clean-local:
-	[ ! -f perl/Makefile ] || $(MAKE) -C perl realclean
+	[ ! -f perl/Makefile ] || ( cd perl && $(MAKE) realclean )
 
 perl: perl/Makefile
-	$(MAKE) -C perl
+	cd perl && $(MAKE)
 
-perl/Makefile: .perl-directory-stamp perl/Makefile.PL perl/Collectd/Makefile.PL
+perl/Makefile: .perl-directory-stamp perl/Makefile.PL \
+	perl/Collectd/Makefile.PL $(top_builddir)/config.status
 	cd perl && @PERL@ Makefile.PL PREFIX=$(prefix) @PERL_BINDINGS_OPTIONS@
 
 .perl-directory-stamp:
 	if test ! -d perl; then \
 	  mkdir -p perl/Collectd; \
-	  cp $(srcdir)/perl/{Collectd.pm,Makefile.PL} perl/; \
-	  cp $(srcdir)/perl/Collectd/{Unixsock.pm,Makefile.PL} perl/Collectd/; \
+	  cp $(srcdir)/perl/Collectd.pm perl/; \
+	  cp $(srcdir)/perl/Makefile.PL perl/; \
+	  cp $(srcdir)/perl/Collectd/Unixsock.pm perl/Collectd/; \
+	  cp $(srcdir)/perl/Collectd/Makefile.PL perl/Collectd/; \
 	fi
 	touch $@