--- sourceforge.net/trunk/rdesktop/Makefile	2002/09/12 09:41:28	120
+++ sourceforge.net/trunk/rdesktop/Makefile	2003/09/30 09:11:08	474
@@ -6,27 +6,40 @@
 
 # Configuration defaults
 
-CC       = cc
-CFLAGS   = -O2 -DKEYMAP_PATH=\"$(KEYMAP_PATH)\"
-INCLUDES = -I/usr/X11R6/include
-LDLIBS   = -L/usr/X11R6/lib -lX11 -lXext
-
-PREFIX   = /usr/local
-EPREFIX  = $(PREFIX)
-BINDIR   = $(EPREFIX)/bin
-MANDIR   = $(PREFIX)/man
-SHAREDIR = $(PREFIX)/share/rdesktop
+prefix      = /usr/local
+exec_prefix = $(prefix)
+bindir      = $(exec_prefix)/bin
+mandir      = $(prefix)/man
+datadir     = $(prefix)/share/rdesktop
+
+KEYMAP_PATH = $(datadir)/keymaps/
+
+RDPOBJ   = tcp.o iso.o mcs.o secure.o licence.o rdp.o orders.o bitmap.o cache.o rdp5.o channels.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
 
-KEYMAP_PATH = $(SHAREDIR)/keymaps/
+include Makeconf  # configure-generated
 
-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
-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
+all: $(TARGETS)
+
+rdesktop: $(X11OBJ) $(SOUNDOBJ) $(RDPOBJ) $(CRYPTOBJ)
+	$(CC) $(CFLAGS) -o rdesktop $(X11OBJ) $(SOUNDOBJ) $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS) -lX11
+
+rdp2vnc: $(VNCOBJ) $(SOUNDOBJ) $(RDPOBJ) $(CRYPTOBJ)
+	$(CCLD) $(CFLAGS) -o rdp2vnc $(VNCOBJ) $(SOUNDOBJ) $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS) $(LDVNC)
 
-include Makeconf  # local configuration
+vnc/rdp2vnc.o: rdesktop.c
+	$(CC) $(CFLAGS) $(VNCINC) -DRDP2VNC -o vnc/rdp2vnc.o -c rdesktop.c
 
+vnc/vnc.o: vnc/vnc.c
+	$(CC) $(CFLAGS) $(VNCINC) -DRDP2VNC -o vnc/vnc.o -c vnc/vnc.c
 
-rdesktop: $(RDPOBJ) $(CRYPTOBJ)
-	$(CC) $(CFLAGS) -o rdesktop $(RDPOBJ) $(CRYPTOBJ) $(LDDIRS) $(LDLIBS)
+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
@@ -34,29 +47,29 @@
 install: installbin installkeymaps installman
 
 installbin: rdesktop
-	mkdir -p $(DESTDIR)/$(BINDIR)
-	install rdesktop $(DESTDIR)/$(BINDIR)
-	strip $(DESTDIR)/$(BINDIR)/rdesktop
-	chmod 755 $(DESTDIR)/$(BINDIR)/rdesktop
+	mkdir -p $(DESTDIR)/$(bindir)
+	install rdesktop $(DESTDIR)/$(bindir)
+	strip $(DESTDIR)/$(bindir)/rdesktop
+	chmod 755 $(DESTDIR)/$(bindir)/rdesktop
 
 installman: doc/rdesktop.1
-	mkdir -p $(DESTDIR)/$(MANDIR)/man1
-	cp doc/rdesktop.1 $(DESTDIR)/$(MANDIR)/man1
-	chmod 644 $(DESTDIR)/$(MANDIR)/man1/rdesktop.1
+	mkdir -p $(DESTDIR)/$(mandir)/man1
+	cp doc/rdesktop.1 $(DESTDIR)/$(mandir)/man1
+	chmod 644 $(DESTDIR)/$(mandir)/man1/rdesktop.1
 
 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
@@ -69,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 \
@@ -86,5 +100,5 @@
 .SUFFIXES: .c .o
 
 .c.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -o $@ -c $<
+	$(CC) $(CFLAGS) -o $@ -c $<