Explorar el Código

Move conditional java targets to the top of Makefile.am.

tags/v0.99.beta17
Sam Hocevar sam hace 15 años
padre
commit
f039d3e4f4
Se han modificado 1 ficheros con 5 adiciones y 5 borrados
  1. +5
    -5
      java/Makefile.am

+ 5
- 5
java/Makefile.am Ver fichero

@@ -1,16 +1,18 @@
# $Id$

jnidir = $(libdir)/jni
libcaca_javadir = $(datadir)/java

java_jar = libjava.jar

if USE_JAVA
jni_LTLIBRARIES = libcaca-java.la
libcaca_java_DATA = $(java_jar)
noinst_DATA = examples/Driver.class examples/TrueColor.class
endif

java_src = $(wildcard $(srcdir)/org/zoy/caca/*.java)

java_jar = libjava.jar

java_jni_headers = \
org_zoy_caca_Attribute.h \
org_zoy_caca_Caca.h \
@@ -81,6 +83,7 @@ EXTRA_DIST = README

if USE_JAVA
BUILT_SOURCES = $(java_jni_headers) $(java_jni_classes)
endif

libcaca_java_la_CPPFLAGS = $(JAVA_CFLAGS)
libcaca_java_la_SOURCES = \
@@ -91,9 +94,6 @@ libcaca_java_la_SOURCES = \
# $(java_jni_headers)
libcaca_java_la_LDFLAGS = -shared $(JAVA_LIBS)
libcaca_java_la_LIBADD = ../caca/libcaca.la
libcaca_java_ladir = $(datadir)/java
libcaca_java_la_DATA = $(java_jar)
endif

examples/Driver.class: examples/Driver.java
$(JAVAC) $^


Cargando…
Cancelar
Guardar