--- sourceforge.net/trunk/rdesktop/Makefile	2001/06/20 13:54:48	28
+++ sourceforge.net/trunk/rdesktop/Makefile	2002/08/14 14:43:25	98
@@ -1,30 +1,90 @@
-##############################################
-# rdesktop: A Remote Desktop Protocol client #
-# Basic Makefile                             #
-# Copyright (C) Matthew Chapman 1999-2000    #
-##############################################
-
-# Uncomment to enable debugging
-# DEBUG = -g -DRDP_DEBUG
-
-CC     = gcc
-CFLAGS = -O2 -Wall $(DEBUG) -I/usr/X11R6/include
-LIBS   = -L/usr/X11R6/lib -lX11 -lnsl
+#
+# rdesktop: A Remote Desktop Protocol client
+# Makefile
+# Copyright (C) Matthew Chapman 1999-2001
+#
+
+# 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
+
+KEYMAP_PATH = $(SHAREDIR)/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
+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  # local configuration
 
-RDPOBJ = rdesktop.o tcp.o iso.o mcs.o secure.o licence.o rdp.o orders.o bitmap.o cache.o xwin.o
-CRYPTOBJ = crypto/rc4_enc.o crypto/rc4_skey.o crypto/md5_dgst.o crypto/sha1dgst.o crypto/arith.o
 
 rdesktop: $(RDPOBJ) $(CRYPTOBJ)
-	$(CC) $(CFLAGS) -o rdesktop $(LIBS) $(RDPOBJ) $(CRYPTOBJ)
+	$(CC) $(CFLAGS) -o rdesktop $(RDPOBJ) $(CRYPTOBJ) $(LDDIRS) $(LDLIBS)
+
+Makeconf:
+	./configure
+
+install: installbin installkeymaps
+
+installbin: rdesktop
+	mkdir -p $(DESTDIR)/$(BINDIR)
+	cp rdesktop $(DESTDIR)/$(BINDIR)
+	strip $(DESTDIR)/$(BINDIR)/rdesktop
+	chmod 755 $(DESTDIR)/$(BINDIR)/rdesktop
+
+# installman: rdesktop.1
+#	mkdir -p $(MANDIR)/man1
+#	cp rdesktop.1 $(MANDIR)/man1
+#	chmod 755 $(MANDIR)/man1/rdesktop.1
+
+installkeymaps:
+	mkdir -p $(DESTDIR)/$(KEYMAP_PATH)
+# Prevent copying the CVS directory
+	cp keymaps/?? $(DESTDIR)/$(KEYMAP_PATH)
+	cp keymaps/common $(DESTDIR)/$(KEYMAP_PATH)
+	cp keymaps/modifiers $(DESTDIR)/$(KEYMAP_PATH)
+	cp keymaps/README $(DESTDIR)/$(KEYMAP_PATH)
+	chmod 644 $(DESTDIR)/$(KEYMAP_PATH)/*
 
 proto:
 	cproto -DMAKE_PROTO -o proto.h *.c
 
 clean:
-	rm -f *.o crypto/*.o *~
+	rm -f *.o crypto/*.o *~ rdesktop
+
+dist:
+	mkdir -p /tmp/rdesktop-make-dist-dir
+	ln -sf `pwd` /tmp/rdesktop-make-dist-dir/rdesktop
+	(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/common \
+	rdesktop/keymaps/?? \
+	rdesktop/keymaps/modifiers \
+	rdesktop/keymaps/convert-map \
+	rdesktop/keymaps/README \
+	rdesktop/doc/HACKING \
+	rdesktop/doc/TODO \
+	rdesktop/Makefile \
+	rdesktop/configure \
+	rdesktop/rdesktop.spec)	
+	rm -rf /tmp/rdesktop-make-dist-dir
 
 .SUFFIXES:
 .SUFFIXES: .c .o
 
 .c.o:
-	$(CC) $(CFLAGS) -o $@ -c $<
+	$(CC) $(CFLAGS) $(INCLUDES) -o $@ -c $<
+