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