projects / packages / libcaca.git / blame
| Commit | Line | Data |
|---|---|---|
| e9440f4c JB |
1 | --- libcaca-0.99.beta20/configure.ac.orig 2021-12-06 22:08:57.028931660 +0100 |
| 2 | +++ libcaca-0.99.beta20/configure.ac 2021-12-07 07:32:44.049213562 +0100 | |
| 3 | @@ -438,9 +438,8 @@ AM_CONDITIONAL(USE_CSHARP, test "${ac_cv | |
| 4 | ac_cv_my_have_java="no" | |
| 5 | if test "${enable_java}" != "no" -a "${ac_cv_my_have_kernel}" != "yes"; then | |
| 6 | AC_PATH_PROG(JAVAC, javac, no) | |
| 7 | - AC_PATH_PROG(JAVAH, javah, no) | |
| 8 | AC_PATH_PROG(JAR, jar, no) | |
| 9 | - if test "${JAVAC}" != "no" -a "${JAVAH}" != "no" -a "${JAR}" != "no"; then | |
| 10 | + if test "${JAVAC}" != "no" -a "${JAR}" != "no"; then | |
| 11 | if test "$JAVA_HOME" = ""; then | |
| 12 | # Try to resolve JAVA_HOME | |
| 13 | JAVAC_EXE="$JAVAC" | |
| 14 | --- libcaca-0.99.beta20/java/Makefile.am.orig 2016-01-26 18:58:28.000000000 +0100 | |
| 15 | +++ libcaca-0.99.beta20/java/Makefile.am 2021-12-07 07:31:52.496537741 +0100 | |
| 16 | @@ -55,7 +55,7 @@ java_jni_java = \ | |
| 17 | org/zoy/caca/TimeoutException.java \ | |
| 18 | org/zoy/caca/Display.java | |
| 19 | ||
| 20 | -JAVAH_FLAGS = -d . -classpath . | |
| 21 | +JAVAH_FLAGS = -h . -classpath . | |
| 22 | ||
| 23 | $(java_jni_classes): $(java_src) | |
| 24 | $(JAVAC) -d . $(java_src) | |
| 25 | @@ -65,31 +65,31 @@ $(java_jni_classes): $(java_src) | |
| 26 | # hence the `touch` so that javah is not run at every `make`. | |
| 27 | ||
| 28 | org_zoy_caca_Attribute.h: org/zoy/caca/Attribute.class | |
| 29 | - $(JAVAH) $(JAVAH_FLAGS) org.zoy.caca.Attribute | |
| 30 | + $(JAVAC) $(JAVAH_FLAGS) org/zoy/caca/Attribute.java | |
| 31 | @touch org_zoy_caca_Attribute.h | |
| 32 | ||
| 33 | org_zoy_caca_Caca.h: org/zoy/caca/Caca.class | |
| 34 | - $(JAVAH) $(JAVAH_FLAGS) org.zoy.caca.Caca | |
| 35 | + $(JAVAC) $(JAVAH_FLAGS) org/zoy/caca/Caca.java | |
| 36 | @touch org_zoy_caca_Caca.h | |
| 37 | ||
| 38 | org_zoy_caca_Canvas.h: org/zoy/caca/Canvas.class | |
| 39 | - $(JAVAH) $(JAVAH_FLAGS) org.zoy.caca.Canvas | |
| 40 | + $(JAVAC) $(JAVAH_FLAGS) org/zoy/caca/Canvas.java | |
| 41 | @touch org_zoy_caca_Canvas.h | |
| 42 | ||
| 43 | org_zoy_caca_Display.h: org/zoy/caca/Display.class | |
| 44 | - $(JAVAH) $(JAVAH_FLAGS) org.zoy.caca.Display | |
| 45 | + $(JAVAC) $(JAVAH_FLAGS) org/zoy/caca/Display.java | |
| 46 | @touch org_zoy_caca_Display.h | |
| 47 | ||
| 48 | org_zoy_caca_Dither.h: org/zoy/caca/Dither.class | |
| 49 | - $(JAVAH) $(JAVAH_FLAGS) org.zoy.caca.Dither | |
| 50 | + $(JAVAC) $(JAVAH_FLAGS) org/zoy/caca/Dither.java | |
| 51 | @touch org_zoy_caca_Dither.h | |
| 52 | ||
| 53 | org_zoy_caca_Event.h: org/zoy/caca/Event.class | |
| 54 | - $(JAVAH) $(JAVAH_FLAGS) org.zoy.caca.Event | |
| 55 | + $(JAVAC) $(JAVAH_FLAGS) org/zoy/caca/Event.java | |
| 56 | @touch org_zoy_caca_Event.h | |
| 57 | ||
| 58 | org_zoy_caca_Font.h: org/zoy/caca/Font.class | |
| 59 | - $(JAVAH) $(JAVAH_FLAGS) org.zoy.caca.Font | |
| 60 | + $(JAVAC) $(JAVAH_FLAGS) org/zoy/caca/Font.java | |
| 61 | @touch org_zoy_caca_Font.h | |
| 62 | ||
| 63 | CLEANFILES = $(noinst_DATA) $(java_jar) \ | |
| 64 | @@ -112,8 +112,8 @@ libcaca_java_la_LDFLAGS = -shared $(JAVA | |
| 65 | libcaca_java_la_LIBADD = ../caca/libcaca.la | |
| 66 | ||
| 67 | examples/Driver.class: examples/Driver.java | |
| 68 | - $(JAVAC) $^ | |
| 69 | + $(JAVAC) -classpath . $^ | |
| 70 | ||
| 71 | examples/TrueColor.class: examples/TrueColor.java | |
| 72 | - $(JAVAC) $^ | |
| 73 | + $(JAVAC) -classpath . $^ | |
| 74 |