[vlc-commits] contrib: caca: add --disable-java , factorize

[Rafaël Carré]

vlc/vlc-1.2 | branch: master | Rafaël Carré <funman at videolan.org> | Sun Nov 27 19:47:54 2011 -0500| [b01540b490da8f29ce418ffdd3b9f96277f960f4] | committer: Jean-Baptiste Kempf

contrib: caca: add --disable-java , factorize
(cherry picked from commit 10b6e2ad22293b1f59c427378ce24cfb542bf229)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=b01540b490da8f29ce418ffdd3b9f96277f960f4
---

 contrib/src/caca/rules.mak |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/contrib/src/caca/rules.mak b/contrib/src/caca/rules.mak
index 992f24f..ebf37cb 100644
--- a/contrib/src/caca/rules.mak
+++ b/contrib/src/caca/rules.mak
@@ -22,11 +22,12 @@ ifdef HAVE_WIN32
 endif
 	$(MOVE)
 
-.caca: caca
+CONFIGURE_FLAGS := --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx --disable-java
 ifdef HAVE_MACOSX
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx --disable-x11
-else
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx
+CONFIGURE_FLAGS += --disable-x11
 endif
+
+.caca: caca
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(CONFIGURE_FLAGS)
 	cd $< && $(MAKE) -C $< install
 	touch $@