1 --- rdesktop-1.1.0/Makefile.orig Fri Jun 14 11:46:27 2002
2 +++ rdesktop-1.1.0/Makefile Fri Jun 14 11:48:46 2002
4 rdesktop: $(RDPOBJ) $(SSL_OBJ) ${GUI_OBJ} ${GNUOBJ}
5 $(CC) $(CFLAGS) $(LDFLAGSOPT) -o rdesktop $(RDPOBJ) $(SSL_OBJ) $(LDDIRS) $(LDLIBS) ${GNUOBJ} ${GUI_OBJ} ${GUI_LIBS} ${SSL_LIBS}
7 -rdp-srvr: $(RDPSOBJ) ${SSL_OBJ} ${GUI_OBJ} $(GNUOBJ)
8 - $(CC) $(CFLAGS) $(LDFLAGSOPT) -o rdp-srvr $(RDPSOBJ) $(SSL_OBJ) $(LDDIRS) $(LDLIBS) ${GNUOBJ} ${GUI_OBJ} ${GUI_LIBS} ${SSL_LIBS}
9 +rdp-srvr: $(RDPSOBJ) ${SSL_OBJ} $(GNUOBJ)
10 + $(CC) $(CFLAGS) $(LDFLAGSOPT) -o rdp-srvr $(RDPSOBJ) $(SSL_OBJ) $(LDDIRS) $(LDLIBS) ${GNUOBJ} ${GUI_LIBS} ${SSL_LIBS}
17 rdp-srvr.o: rdesktop.c
18 - $(CC) $(CFLAGS) -DSERVER -o $@ -c $<
19 + $(CC) $(CFLAGS) $(SSL_INCLUDES) $(INCLUDES) -DSERVER -o $@ -c $<
22 - $(CC) $(CFLAGS) -DSERVER -o $@ -c $<
23 + $(CC) $(CFLAGS) $(SSL_INCLUDES) $(INCLUDES) -DSERVER -o $@ -c $<
26 - $(CC) $(CFLAGS) -DSERVER -o $@ -c $<
27 + $(CC) $(CFLAGS) $(SSL_INCLUDES) $(INCLUDES) -DSERVER -o $@ -c $<
30 - $(CC) $(CFLAGS) -DSERVER -o $@ -c $<
31 + $(CC) $(CFLAGS) $(SSL_INCLUDES) $(INCLUDES) -DSERVER -o $@ -c $<
34 - $(CC) $(CFLAGS) -DSERVER -o $@ -c $<
35 + $(CC) $(CFLAGS) $(SSL_INCLUDES) $(INCLUDES) -DSERVER -o $@ -c $<
38 - $(CC) $(CFLAGS) -DSERVER -o $@ -c $<
39 + $(CC) $(CFLAGS) $(SSL_INCLUDES) $(INCLUDES) -DSERVER -o $@ -c $<
41 -xwin-s.o: xwin.c keymap_wrap.c keymap.c
42 - $(CC) $(CFLAGS) -DSERVER -o $@ -c $<
43 +xwin-s.o: gl/xwin.c keymap_wrap.c keymap.h
44 + $(CC) $(CFLAGS) $(SSL_INCLUDES) $(INCLUDES) -DSERVER -o $@ -c $<
48 --- rdesktop-1.1.0/gl/xwin.c.orig Fri Jun 14 11:56:33 2002
49 +++ rdesktop-1.1.0/gl/xwin.c Fri Jun 14 11:59:53 2002
56 #include <keymap_wrap.c>
60 #include <X11/keysym.h>
63 x_key_to_sym(key, down)