aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/makefile
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-08-07 12:48:14 +0000
committermarha <marha@users.sourceforge.net>2009-08-07 12:48:14 +0000
commit34d4fe9da3216ff662ada65e2c3132b9b003cce7 (patch)
tree267decdedc9439fa3068ddc59fbc77038718dfe3 /xorg-server/makefile
parente7e9a66629ada359ad6a35cdb12e0e35b49e889c (diff)
downloadvcxsrv-34d4fe9da3216ff662ada65e2c3132b9b003cce7.tar.gz
vcxsrv-34d4fe9da3216ff662ada65e2c3132b9b003cce7.tar.bz2
vcxsrv-34d4fe9da3216ff662ada65e2c3132b9b003cce7.zip
- Also build plink from the xorg-server makefile
- xlaunch is now a windows application (instead of a console application)
Diffstat (limited to 'xorg-server/makefile')
-rw-r--r--xorg-server/makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/xorg-server/makefile b/xorg-server/makefile
index 3391a1d77..a9f8160a9 100644
--- a/xorg-server/makefile
+++ b/xorg-server/makefile
@@ -92,11 +92,17 @@ load_makefile ..\xkbcomp\makefile MAKESERVER=0 DEBUG=$(DEBUG)
xkbcomp.exe: ..\xkbcomp\$(OBJDIR:obj\$(OBJDIRPREFIX)%=obj\%)\xkbcomp.exe
copy $< $@
+load_makefile ..\tools\plink\makefile MAKESERVER=0 DEBUG=$(DEBUG))
+
+plink.exe: ..\tools\plink\$(OBJDIR:obj\$(OBJDIRPREFIX)%=obj\%)\plink.exe
+ copy $< $@
+
load_makefile ..\libX11\nls\makefile MAKESERVER=0 DEBUG=0
load_makefile fonts.src\makefile MAKESERVER=0 DEBUG=0
load_makefile xkbdata.src\makefile MAKESERVER=0 DEBUG=0
-all: $(TTYAPP).exe xlaunch.exe xkbcomp.exe protocol.txt XKeysymDB ..\libX11\nls\all fonts.src\all xkbdata.src\all
+all: $(TTYAPP).exe xlaunch.exe xkbcomp.exe protocol.txt XKeysymDB ..\libX11\nls\all fonts.src\all xkbdata.src\all \
+ plink.exe
protocol.txt: dix\protocol.txt
copy $< $@