--- sourceforge.net/trunk/rdesktop/Makefile	2002/09/24 07:27:43	189
+++ sourceforge.net/trunk/rdesktop/Makefile	2003/09/15 08:01:58	469
@@ -6,10 +6,6 @@
 
 # Configuration defaults
 
-CC       = cc
-CFLAGS   = -O2 -DKEYMAP_PATH=\"$(KEYMAP_PATH)\"
-LDFLAGS  =
-
 prefix      = /usr/local
 exec_prefix = $(prefix)
 bindir      = $(exec_prefix)/bin
@@ -18,14 +14,32 @@
 
 KEYMAP_PATH = $(datadir)/keymaps/
 
-RDPOBJ   = rdesktop.o tcp.o iso.o mcs.o secure.o licence.o rdp.o orders.o bitmap.o cache.o xwin.o xkeymap.o readpass.o
+RDPOBJ   = tcp.o iso.o mcs.o secure.o licence.o rdp.o orders.o bitmap.o cache.o rdp5.o channels.o rdpsnd.o rdpdr.o serial.o printer.o
+X11OBJ   = rdesktop.o xwin.o xkeymap.o ewmhints.o xclip.o cliprdr.o
+VNCOBJ   = vnc/rdp2vnc.o vnc/vnc.o vnc/xkeymap.o vnc/x11stubs.o
 CRYPTOBJ = crypto/rc4_enc.o crypto/rc4_skey.o crypto/md5_dgst.o crypto/sha1dgst.o crypto/bn_exp.o crypto/bn_mul.o crypto/bn_div.o crypto/bn_sqr.o crypto/bn_add.o crypto/bn_shift.o crypto/bn_asm.o crypto/bn_ctx.o crypto/bn_lib.o
 
 include Makeconf  # configure-generated
 
+all: $(TARGETS)
+
+rdesktop: $(X11OBJ) $(RDPOBJ) $(CRYPTOBJ)
+	$(CC) $(CFLAGS) -o rdesktop $(X11OBJ) $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS) -lX11
+
+rdp2vnc: $(VNCOBJ) $(RDPOBJ) $(CRYPTOBJ)
+	$(CCLD) $(CFLAGS) -o rdp2vnc $(VNCOBJ) $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS) $(LDVNC)
+
+vnc/rdp2vnc.o: rdesktop.c
+	$(CC) $(CFLAGS) $(VNCINC) -DRDP2VNC -o vnc/rdp2vnc.o -c rdesktop.c
 
-rdesktop: $(RDPOBJ) $(CRYPTOBJ)
-	$(CC) $(CFLAGS) -o rdesktop $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS)
+vnc/vnc.o: vnc/vnc.c
+	$(CC) $(CFLAGS) $(VNCINC) -DRDP2VNC -o vnc/vnc.o -c vnc/vnc.c
+
+vnc/xkeymap.o: xkeymap.c
+	$(CC) $(CFLAGS) $(VNCINC) -DRDP2VNC -o vnc/xkeymap.o -c xkeymap.c
+
+vnc/x11stubs.o: vnc/x11stubs.c
+	$(CC) $(CFLAGS) $(VNCINC) -o vnc/x11stubs.o -c vnc/x11stubs.c
 
 Makeconf:
 	./configure
@@ -46,16 +60,16 @@
 installkeymaps:
 	mkdir -p $(DESTDIR)/$(KEYMAP_PATH)
 # Prevent copying the CVS directory
-	cp keymaps/?? $(DESTDIR)/$(KEYMAP_PATH)
+	cp keymaps/?? keymaps/??-?? $(DESTDIR)/$(KEYMAP_PATH)
 	cp keymaps/common $(DESTDIR)/$(KEYMAP_PATH)
 	cp keymaps/modifiers $(DESTDIR)/$(KEYMAP_PATH)
 	chmod 644 $(DESTDIR)/$(KEYMAP_PATH)/*
 
 proto:
-	cproto -DMAKE_PROTO -o proto.h *.c
+	cproto -DMAKE_PROTO -DWITH_OPENSSL -o proto.h *.c
 
 clean:
-	rm -f *.o crypto/*.o *~ rdesktop
+	rm -f *.o crypto/*.o *~ vnc/*.o vnc/*~ rdesktop rdp2vnc
 
 dist:
 	mkdir -p /tmp/rdesktop-make-dist-dir
@@ -68,8 +82,9 @@
 	rdesktop/crypto/*.h \
 	rdesktop/*.c \
 	rdesktop/*.h \
-	rdesktop/keymaps/common \
 	rdesktop/keymaps/?? \
+	rdesktop/keymaps/??-?? \
+	rdesktop/keymaps/common \
 	rdesktop/keymaps/modifiers \
 	rdesktop/keymaps/convert-map \
 	rdesktop/doc/HACKING \