Skip to content

V
vlc-1.1
Commit 5e80d19e authored by Filippo Carone's avatar Filippo Carone
Browse files
Options

10 PRINT "Remember to include a final endif at the end of Makefile.am." 

20 GOTO 10
parent 2a5b03c8
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 7 deletions
bindings/java/Makefile.am
View file @ 5e80d19e
...@@ -13,7 +13,7 @@ JINCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32 ...@@ -13,7 +13,7 @@ JINCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32
LIBJINCLUDES = -L${JAVA_HOME}/lib -ljawt LIBJINCLUDES = -L${JAVA_HOME}/lib -ljawt
JCC = javac JCC = javac
JCH = javah JCH = javah
#JAVA_CC_FLAGS = JCC_FLAGS =
#CXX = g++ -Wall -mno-cygwin -g #CXX = g++ -Wall -mno-cygwin -g
#LDFLAGS = -mno-cygwin `vlc-config --libs external pic` -Wl,--kill-at #LDFLAGS = -mno-cygwin `vlc-config --libs external pic` -Wl,--kill-at
JAVACXXFLAGS = `top_builddir=../.. ../../vlc-config --cflags pic` -I../../ -I ../../include $(JINCLUDES) JAVACXXFLAGS = `top_builddir=../.. ../../vlc-config --cflags pic` -I../../ -I ../../include $(JINCLUDES)
...@@ -53,11 +53,6 @@ VlcClient: $(OBJECTS) ...@@ -53,11 +53,6 @@ VlcClient: $(OBJECTS)
VLCExample: $(OBJECTS) VLCExample: $(OBJECTS)
$(JCC) $(JCC_FLAGS) VLCExample.java $(JCC) $(JCC_FLAGS) VLCExample.java
if HAVE_WIN32
%.class: %.java
$(JCC) $(JCC_FLAGS) $?
$(JCH) org.videolan.jvlc.$(*F)
else
%.class: %.java %.class: %.java
$(JCC) $(JCC_FLAGS) $? $(JCC) $(JCC_FLAGS) $?
$(JCH) org/videolan/jvlc/$(*F) $(JCH) org/videolan/jvlc/$(*F)
...@@ -65,4 +60,4 @@ else ...@@ -65,4 +60,4 @@ else
clean: clean:
rm -f *.class *~ org/videolan/jvlc/*.class org_videolan*.h *.so *.o rm -f *.class *~ org/videolan/jvlc/*.class org_videolan*.h *.so *.o
endif endif
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment