summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDRC <dcommander@users.sourceforge.net>2010-03-04 00:15:53 +0000
committerDRC <dcommander@users.sourceforge.net>2010-03-04 00:15:53 +0000
commit24537410bf99c3b5ce94d05c19cdb87eede0208c (patch)
tree198314b756dba2a38b60e5bdd253dd58e31140e5
parent315b999debaff544b8d293b11f1adc79abf1eec9 (diff)
downloadtigervnc-24537410bf99c3b5ce94d05c19cdb87eede0208c.tar.gz
tigervnc-24537410bf99c3b5ce94d05c19cdb87eede0208c.zip
Fix JAR file so that Java viewer can be run without a web server
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4002 3789f03b-4d11-0410-bbf8-ca57d06f2519
-rw-r--r--java/src/com/tigervnc/vncviewer/MANIFEST.MF2
-rw-r--r--java/src/com/tigervnc/vncviewer/Makefile9
-rw-r--r--java/src/com/tigervnc/vncviewer/index.html2
3 files changed, 9 insertions, 4 deletions
diff --git a/java/src/com/tigervnc/vncviewer/MANIFEST.MF b/java/src/com/tigervnc/vncviewer/MANIFEST.MF
index 9ddbfbcc..b3574fe2 100644
--- a/java/src/com/tigervnc/vncviewer/MANIFEST.MF
+++ b/java/src/com/tigervnc/vncviewer/MANIFEST.MF
@@ -1,2 +1,2 @@
Manifest-Version: 1.0
-Main-Class: VncViewer
+Main-Class: com.tigervnc.vncviewer.VncViewer
diff --git a/java/src/com/tigervnc/vncviewer/Makefile b/java/src/com/tigervnc/vncviewer/Makefile
index 01cf48b1..46752ab1 100644
--- a/java/src/com/tigervnc/vncviewer/Makefile
+++ b/java/src/com/tigervnc/vncviewer/Makefile
@@ -35,7 +35,12 @@ $(CLASSES): $(SOURCES)
$(JC) $(JCFLAGS) -O $(SOURCES)
$(ARCHIVE): $(CLASSES) $(MANIFEST)
- $(JAR) cfm $(ARCHIVE) $(MANIFEST) $(CLASSES)
+ cd ../../..; \
+ $(JAR) cfm com/tigervnc/vncviewer/$(ARCHIVE) \
+ com/tigervnc/vncviewer/$(MANIFEST) \
+ com/tigervnc/vncviewer/*.class \
+ com/tigervnc/decoder/*.class \
+ com/tigervnc/decoder/common/*.class
install: $(CLASSES) $(ARCHIVE)
$(CP) $(CLASSES) $(ARCHIVE) $(PAGES) $(INSTALL_DIR)
@@ -44,4 +49,4 @@ export:: $(CLASSES) $(ARCHIVE) $(PAGES)
@$(ExportJavaClasses)
clean::
- $(RM) *.class *.jar
+ $(RM) *.class *.jar ../decoder/*.class ../decoder/common/*.class
diff --git a/java/src/com/tigervnc/vncviewer/index.html b/java/src/com/tigervnc/vncviewer/index.html
index 96805dc5..a582b2d0 100644
--- a/java/src/com/tigervnc/vncviewer/index.html
+++ b/java/src/com/tigervnc/vncviewer/index.html
@@ -20,7 +20,7 @@
<TITLE>
TigerVNC desktop
</TITLE>
-<APPLET CODE="VncViewer.class" ARCHIVE="VncViewer.jar"
+<APPLET CODE="com.tigervnc.vncviewer.VncViewer" ARCHIVE="VncViewer.jar"
WIDTH="800" HEIGHT="632">
<PARAM NAME="PORT" VALUE="5901">
</APPLET>