--- sourceforge.net/trunk/rdesktop/Makefile	2003/06/06 11:11:44	417
+++ sourceforge.net/trunk/rdesktop/Makefile	2004/04/27 12:55:33	683
@@ -1,7 +1,7 @@
 #
 # rdesktop: A Remote Desktop Protocol client
 # Makefile
-# Copyright (C) Matthew Chapman 1999-2001
+# Copyright (C) Matthew Chapman 1999-2004
 #
 
 # Configuration defaults
@@ -12,21 +12,23 @@
 mandir      = $(prefix)/man
 datadir     = $(prefix)/share/rdesktop
 
+VERSION     = 1.3.1
 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 ewmhints.o rdp5.o channels.o cliprdr.o ipc.o
-RDP2VNCOBJ   = vnc/rdp2vnc.o tcp.o iso.o mcs.o secure.o licence.o rdp.o orders.o bitmap.o cache.o vnc/vnc.o vnc/xkeymap.o vnc/x11stubs.o rdp5.o
+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 disk.o parallel.o printercache.o mppc.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: $(RDPOBJ) $(CRYPTOBJ)
-	$(CC) $(CFLAGS) -o rdesktop $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS) -lX11
+rdesktop: $(X11OBJ) $(SOUNDOBJ) $(RDPOBJ) $(CRYPTOBJ)
+	$(CC) $(CFLAGS) -o rdesktop $(X11OBJ) $(SOUNDOBJ) $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS) -lX11
 
-rdp2vnc: $(RDP2VNCOBJ) $(CRYPTOBJ)
-	$(CCLD) $(CFLAGS) -o rdp2vnc $(RDP2VNCOBJ) $(CRYPTOBJ) $(LDFLAGS) $(LDVNC)
+rdp2vnc: $(VNCOBJ) $(SOUNDOBJ) $(RDPOBJ) $(CRYPTOBJ)
+	$(CCLD) $(CFLAGS) -o rdp2vnc $(VNCOBJ) $(SOUNDOBJ) $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS) $(LDVNC)
 
 vnc/rdp2vnc.o: rdesktop.c
 	$(CC) $(CFLAGS) $(VNCINC) -DRDP2VNC -o vnc/rdp2vnc.o -c rdesktop.c
@@ -47,7 +49,7 @@
 
 installbin: rdesktop
 	mkdir -p $(DESTDIR)/$(bindir)
-	install rdesktop $(DESTDIR)/$(bindir)
+	$(INSTALL) rdesktop $(DESTDIR)/$(bindir)
 	strip $(DESTDIR)/$(bindir)/rdesktop
 	chmod 755 $(DESTDIR)/$(bindir)/rdesktop
 
@@ -65,34 +67,42 @@
 	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 *~ vnc/*.o vnc/*~ rdesktop rdp2vnc
 
 dist:
 	mkdir -p /tmp/rdesktop-make-dist-dir
-	ln -sf `pwd` /tmp/rdesktop-make-dist-dir/rdesktop
+	ln -sf `pwd` /tmp/rdesktop-make-dist-dir/rdesktop-$(VERSION)
 	(cd /tmp/rdesktop-make-dist-dir; \
-	tar zcvf rdesktop/rdesktop.tgz \
-	rdesktop/COPYING \
-	rdesktop/crypto/README \
-	rdesktop/crypto/*.c \
-	rdesktop/crypto/*.h \
-	rdesktop/*.c \
-	rdesktop/*.h \
-	rdesktop/keymaps/?? \
-	rdesktop/keymaps/??-?? \
-	rdesktop/keymaps/common \
-	rdesktop/keymaps/modifiers \
-	rdesktop/keymaps/convert-map \
-	rdesktop/doc/HACKING \
-	rdesktop/doc/TODO \
-	rdesktop/doc/keymapping.txt \
-	rdesktop/doc/rdesktop.1 \
-	rdesktop/Makefile \
-	rdesktop/configure \
-	rdesktop/rdesktop.spec)
+	tar zcvf rdesktop-$(VERSION)/rdesktop-$(VERSION).tar.gz \
+	rdesktop-$(VERSION)/COPYING \
+	rdesktop-$(VERSION)/README \
+	rdesktop-$(VERSION)/configure \
+	rdesktop-$(VERSION)/Makefile \
+	rdesktop-$(VERSION)/rdesktop.spec \
+	rdesktop-$(VERSION)/*.c \
+	rdesktop-$(VERSION)/*.h \
+	rdesktop-$(VERSION)/crypto/README \
+	rdesktop-$(VERSION)/crypto/*.c \
+	rdesktop-$(VERSION)/crypto/*.h \
+	rdesktop-$(VERSION)/keymaps/?? \
+	rdesktop-$(VERSION)/keymaps/??-?? \
+	rdesktop-$(VERSION)/keymaps/common \
+	rdesktop-$(VERSION)/keymaps/modifiers \
+	rdesktop-$(VERSION)/keymaps/convert-map \
+	rdesktop-$(VERSION)/doc/HACKING \
+	rdesktop-$(VERSION)/doc/AUTHORS \
+	rdesktop-$(VERSION)/doc/TODO \
+	rdesktop-$(VERSION)/doc/ChangeLog \
+	rdesktop-$(VERSION)/doc/keymapping.txt \
+	rdesktop-$(VERSION)/doc/keymap-names.txt \
+	rdesktop-$(VERSION)/doc/ipv6.txt \
+	rdesktop-$(VERSION)/doc/licensing.txt \
+	rdesktop-$(VERSION)/doc/patches.txt \
+	rdesktop-$(VERSION)/doc/redirection.txt \
+	rdesktop-$(VERSION)/doc/rdesktop.1 )
 	rm -rf /tmp/rdesktop-make-dist-dir
 
 .SUFFIXES: