Completely reworked Java viewer (contributed by Brian Hinz)
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4413 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/java/src/com/tigervnc/vncviewer/Makefile b/java/src/com/tigervnc/vncviewer/Makefile
index 39ccbb7..99c04ac 100644
--- a/java/src/com/tigervnc/vncviewer/Makefile
+++ b/java/src/com/tigervnc/vncviewer/Makefile
@@ -11,25 +11,15 @@
PAGES = index.vnc
INSTALL_DIR = /usr/local/vnc/classes
-CLASSES = VncViewer.class RfbProto.class AuthPanel.class VncCanvas.class \
- VncCanvas2.class \
- OptionsFrame.class ClipboardFrame.class ButtonPanel.class \
- DesCipher.class \
- RecordingFrame.class SessionRecorder.class \
- SocketFactory.class HTTPConnectSocketFactory.class \
- HTTPConnectSocket.class ReloginPanel.class \
- InStream.class MemInStream.class ZlibInStream.class \
- TLSTunnelBase.class TLSTunnel.class X509Tunnel.class Dialog.class MessageBox.class
+CLASSES = CConn.class OptionsDialogCallback.class ClipboardDialog.class \
+ PasswdDialog.class DesktopWindow.class PixelBufferImage.class \
+ Dialog.class ServerDialog.class F8Menu.class UserPrefs.class \
+ OptionsDialog.class VncViewer.class
-SOURCES = VncViewer.java RfbProto.java AuthPanel.java VncCanvas.java \
- VncCanvas2.java \
- OptionsFrame.java ClipboardFrame.java ButtonPanel.java \
- DesCipher.java \
- RecordingFrame.java SessionRecorder.java \
- SocketFactory.java HTTPConnectSocketFactory.java \
- HTTPConnectSocket.java ReloginPanel.java \
- InStream.java MemInStream.java ZlibInStream.java \
- TLSTunnelBase.java TLSTunnel.java X509Tunnel.java Dialog.java MessageBox.java
+SOURCES = CConn.java OptionsDialogCallback.java ClipboardDialog.java \
+ PasswdDialog.java DesktopWindow.java PixelBufferImage.java \
+ Dialog.java ServerDialog.java F8Menu.java UserPrefs.java \
+ OptionsDialog.java VncViewer.java
all: $(CLASSES) $(ARCHIVE)
@@ -41,8 +31,10 @@
$(JAR) cfm com/tigervnc/vncviewer/$(ARCHIVE) \
com/tigervnc/vncviewer/$(MANIFEST) \
com/tigervnc/vncviewer/*.class \
- com/tigervnc/decoder/*.class \
- com/tigervnc/decoder/common/*.class
+ com/tigervnc/rfb/*.class \
+ com/tigervnc/rdr/*.class \
+ com/tigervnc/vncviewer/tigervnc.png \
+ com/tigervnc/vncviewer/tigervnc.ico
install: $(CLASSES) $(ARCHIVE)
$(CP) $(CLASSES) $(ARCHIVE) $(PAGES) $(INSTALL_DIR)
@@ -51,4 +43,4 @@
@$(ExportJavaClasses)
clean::
- $(RM) *.class *.jar ../decoder/*.class ../decoder/common/*.class
+ $(RM) *.class *.jar ../rfb/*.class ../rdr/*.class