--- sourceforge.net/trunk/rdesktop/Makefile.in 2005/08/25 20:39:58 989 +++ sourceforge.net/trunk/rdesktop/Makefile.in 2007/01/04 05:39:39 1365 @@ -1,13 +1,14 @@ # # rdesktop: A Remote Desktop Protocol client # Makefile.in -# Copyright (C) Matthew Chapman 1999-2005 +# Copyright (C) Matthew Chapman 1999-2007 # prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ mandir = @mandir@ +datarootdir = @datarootdir@ datadir = @datadir@ VERSION = @PACKAGE_VERSION@ @@ -17,25 +18,27 @@ INSTALL = @INSTALL@ CFLAGS = @CFLAGS@ @X_CFLAGS@ @DEFS@ -DKEYMAP_PATH=\"$(KEYMAP_PATH)\" LDFLAGS = @LDFLAGS@ @LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ +STRIP = @STRIP@ TARGETS = rdesktop @RDP2VNCTARGET@ VNCINC = @VNCINC@ LDVNC = @LDVNC@ VNCLINK = @VNCLINK@ SOUNDOBJ = @SOUNDOBJ@ +SCARDOBJ = @SCARDOBJ@ -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 pstcache.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 pstcache.o lspci.o seamless.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 .PHONY: all all: $(TARGETS) -rdesktop: $(X11OBJ) $(SOUNDOBJ) $(RDPOBJ) - $(CC) $(CFLAGS) -o rdesktop $(X11OBJ) $(SOUNDOBJ) $(RDPOBJ) $(LDFLAGS) -lX11 +rdesktop: $(X11OBJ) $(SOUNDOBJ) $(RDPOBJ) $(SCARDOBJ) + $(CC) $(CFLAGS) -o rdesktop $(X11OBJ) $(SOUNDOBJ) $(RDPOBJ) $(SCARDOBJ) $(LDFLAGS) -lX11 -rdp2vnc: $(VNCOBJ) $(SOUNDOBJ) $(RDPOBJ) - $(VNCLINK) $(CFLAGS) -o rdp2vnc $(VNCOBJ) $(SOUNDOBJ) $(RDPOBJ) $(LDFLAGS) $(LDVNC) +rdp2vnc: $(VNCOBJ) $(SOUNDOBJ) $(RDPOBJ) $(SCARDOBJ) + $(VNCLINK) $(CFLAGS) -o rdp2vnc $(VNCOBJ) $(SOUNDOBJ) $(RDPOBJ) $(SCARDOBJ) $(LDFLAGS) $(LDVNC) vnc/rdp2vnc.o: rdesktop.c $(CC) $(CFLAGS) $(VNCINC) -DRDP2VNC -o vnc/rdp2vnc.o -c rdesktop.c @@ -56,7 +59,7 @@ installbin: rdesktop mkdir -p $(DESTDIR)$(bindir) $(INSTALL) rdesktop $(DESTDIR)$(bindir) - strip $(DESTDIR)$(bindir)/rdesktop + $(STRIP) $(DESTDIR)$(bindir)/rdesktop chmod 755 $(DESTDIR)$(bindir)/rdesktop .PHONY: installman @@ -80,8 +83,9 @@ cproto -DMAKE_PROTO \ bitmap.c cache.c channels.c cliprdr.c disk.c mppc.c ewmhints.c \ iso.c licence.c mcs.c orders.c parallel.c printer.c printercache.c \ - pstcache.c rdesktop.c rdp5.c rdp.c rdpdr.c rdpsnd.c rdpsnd_oss.c \ - secure.c serial.c tcp.c xclip.c xkeymap.c xwin.c >> proto.h + pstcache.c rdesktop.c rdp5.c rdp.c rdpdr.c rdpsnd.c \ + secure.c serial.c tcp.c xclip.c xkeymap.c xwin.c lspci.c seamless.c \ + scard.c >> proto.h cat proto.tail >> proto.h .PHONY: clean