blob: fc0f41f2c8d12c3895a5ae4a217b0aab8587faef (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
diff -bcr xc.org/programs/Xserver/Imakefile xc/programs/Xserver/Imakefile
*** xc.org/programs/Xserver/Imakefile 2004-12-15 20:22:53.000000000 +0100
--- xc/programs/Xserver/Imakefile 2005-02-14 14:23:21.000000000 +0100
***************
*** 128,134 ****
LIBREGEX = RegexLibrary
#if DoLoadableServer
! LIBCWRAPPER = os/libcwrapper.o
#endif
#if BuildXprint
--- 128,134 ----
LIBREGEX = RegexLibrary
#if DoLoadableServer
! LIBCWRAPPER = os/libcwrapper.o os/libos.a
#endif
#if BuildXprint
***************
*** 414,419 ****
--- 414,430 ----
#define ServerToInstall Xsun
#endif
#endif /* XsunServer */
+ XCOMM
+ XCOMM X VNC server
+ XCOMM
+ FBSUBDIR = fb
+ XVNCDDXDIR = vnc/Xvnc
+ XVNCDIRS = $(STDDIRS) $(FBSUBDIR) miext/damage $(XVNCDDXDIR) $(DEPDIRS)
+ XVNCLIBS = PreFbLibs vnc/Xvnc/LibraryTargetName(xvnc) FbPostFbLibs
+ XVNCOBJS = $(XVNCDDXDIR)/stubs.o $(XVNCDDXDIR)/miinitext.o
+ XVNCSYSLIBS = $(FONTLIBS) $(SYSLIBS)
+ ServerTarget(Xvnc,$(XVNCDIRS),$(XVNCOBJS), \
+ $(XVNCLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER),$(XVNCSYSLIBS))
#if defined(Xsun24Server) && Xsun24Server
diff -bcr xc.org/programs/Xserver/mi/miinitext.c xc/programs/Xserver/mi/miinitext.c
*** xc.org/programs/Xserver/mi/miinitext.c 2004-12-13 06:48:41.000000000 +0100
--- xc/programs/Xserver/mi/miinitext.c 2005-02-11 16:47:34.000000000 +0100
***************
*** 286,291 ****
--- 286,294 ----
#ifdef MITMISC
extern void MITMiscExtensionInit(INITARGS);
#endif
+ #ifdef VNCEXT
+ extern void vncExtensionInit(INITARGS);
+ #endif
#ifdef XIDLE
extern void XIdleExtensionInit(INITARGS);
#endif
***************
*** 587,592 ****
--- 590,598 ----
#ifdef MITMISC
if (!noMITMiscExtension) MITMiscExtensionInit();
#endif
+ #ifdef VNCEXT
+ vncExtensionInit();
+ #endif
#ifdef XIDLE
if (!noXIdleExtension) XIdleExtensionInit();
#endif
|
