Isolate our patches to the VNC client from the upstream TightVNC

[invirt/packages/invirt-vnc-client.git] / Makefile

diff --git a/Makefile b/Makefile
index 30654a7..f236eae 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 
 CP = cp
 JC = javac
-JCFLAGS = -target 1.1 -source 1.2
+JCFLAGS = -target 1.1
 JAR = jar
 ARCHIVE = VncViewer.jar
 MANIFEST = MANIFEST.MF
@@ -17,10 +17,8 @@ CLASSES = VncViewer.class RfbProto.class AuthPanel.class VncCanvas.class \
          DesCipher.class CapabilityInfo.class CapsContainer.class \
          RecordingFrame.class SessionRecorder.class \
          SocketFactory.class HTTPConnectSocketFactory.class \
-         VNCProxyConnectSocketFactory.class VNCProxyConnectSocket.class \
          HTTPConnectSocket.class ReloginPanel.class \
-         InStream.class MemInStream.class ZlibInStream.class \
-         VNCProxyConnectSocketWrapper.class SocketWrapper.class SocketWrapper\$$WrappingSocketImpl.class InvirtTrustManager.class
+         InStream.class MemInStream.class ZlibInStream.class
 
 SOURCES = VncViewer.java RfbProto.java AuthPanel.java VncCanvas.java \
          VncCanvas2.java \
@@ -28,12 +26,8 @@ SOURCES = VncViewer.java RfbProto.java AuthPanel.java VncCanvas.java \
          DesCipher.java CapabilityInfo.java CapsContainer.java \
          RecordingFrame.java SessionRecorder.java \
          SocketFactory.java HTTPConnectSocketFactory.java \
-         VNCProxyConnectSocketFactory.java VNCProxyConnectSocket.java \
          HTTPConnectSocket.java ReloginPanel.java \
-         InStream.java MemInStream.java ZlibInStream.java \
-         VNCProxyConnectSocketWrapper.java SocketWrapper.java InvirtTrustManager.java
-
-EXTRAJAR = trust.store
+         InStream.java MemInStream.java ZlibInStream.java
 
 all: $(CLASSES) $(ARCHIVE)
 
@@ -41,7 +35,7 @@ $(CLASSES): $(SOURCES)
        $(JC) $(JCFLAGS) -O $(SOURCES)
 
 $(ARCHIVE): $(CLASSES) $(MANIFEST)
-       $(JAR) cfm $(ARCHIVE) $(MANIFEST) $(CLASSES) $(EXTRAJAR)
+       $(JAR) cfm $(ARCHIVE) $(MANIFEST) $(CLASSES)
 
 install: $(CLASSES) $(ARCHIVE)
        $(CP) $(CLASSES) $(ARCHIVE) $(PAGES) $(INSTALL_DIR)