diff options
| author | alanh <alanh> | 2001-05-01 17:23:26 +0000 |
|---|---|---|
| committer | alanh <alanh> | 2001-05-01 17:23:26 +0000 |
| commit | 87505e1c1f33555593da57379ba93bb0ef8df924 (patch) | |
| tree | ec433beabad2db735c8f4b2af0abe3576256e8b7 /programs | |
| parent | a20ee347a8cc02fdbd62de55c137f445862bc30e (diff) | |
disable xload on cygwin platforms.
Diffstat (limited to 'programs')
| -rw-r--r-- | programs/Imakefile | 8 | ||||
| -rw-r--r-- | programs/Xserver/hw/xfree86/CHANGELOG | 3 | ||||
| -rw-r--r-- | programs/x11perf/Imakefile | 6 |
3 files changed, 13 insertions, 4 deletions
diff --git a/programs/Imakefile b/programs/Imakefile index 6436f0fa5..db4f398ed 100644 --- a/programs/Imakefile +++ b/programs/Imakefile @@ -2,7 +2,7 @@ XCOMM $Xorg: Imakefile,v 1.4 2000/08/17 19:47:01 cpqbld Exp $ -XCOMM $XFree86: xc/programs/Imakefile,v 3.43 2001/04/02 21:12:07 dawes Exp $ +XCOMM $XFree86: xc/programs/Imakefile,v 3.44 2001/04/26 21:27:49 dawes Exp $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" @@ -91,6 +91,10 @@ XINPUTCLIENTDIRS = xsetmode xsetpointer GLXCLIENTDIRS = glxinfo glxgears #endif +#ifndef cygwinArchitecture + XLOADDIR = xload +#endif + #if BuildServersOnly || !BuildClients SUBDIRS = $(XSSRCDIR) #else @@ -107,7 +111,7 @@ SUBDIRS = \ xcmsdb $(XCONSOLESRCDIR) xditview $(XDMSRCDIR) xdpyinfo \ $(XF86DGASRCDIR) xedit xev xeyes xfd xfontsel $(XFSSRCDIR) xfsinfo \ $(XFINDPROXYSRCDIR) $(XFWPSRCDIR) $(XGAMMASRCDIR) xgc $(XHOSTSRCDIR) \ - $(XIECLIENTDIRS) $(XINITSRCDIR) $(XKBSRCDIRS) xkill xload xlogo \ + $(XIECLIENTDIRS) $(XINITSRCDIR) $(XKBSRCDIRS) xkill $(XLOADDIR) xlogo \ xlsatoms \ xlsclients xlsfonts xmag xman xmessage xmh xmodmap xprop xrdb \ xrefresh $(XRXSRCDIR) xset \ diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG index 8872a2e9f..397ab4ed0 100644 --- a/programs/Xserver/hw/xfree86/CHANGELOG +++ b/programs/Xserver/hw/xfree86/CHANGELOG @@ -1,4 +1,5 @@ XFree86 4.0.99.x (xx April 2001) + 462. Disable xload on Cygwin/XFree86 (Alan Hourihane). 461. Remove an errorneous i++ from os/xdmcp.c with -class (Alexander Gottwald). 460. Allow Cygwin/XFree86 to build with cygipc support (Alan Hourihane). 459. Small XDarwin fixes: @@ -13125,4 +13126,4 @@ XFree86 3.0a (28 April 1994) XFree86 3.0 (26 April 1994) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.1732 2001/04/30 16:25:58 torrey Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.1733 2001/05/01 07:53:48 alanh Exp $ diff --git a/programs/x11perf/Imakefile b/programs/x11perf/Imakefile index 4f14d1900..283d9a343 100644 --- a/programs/x11perf/Imakefile +++ b/programs/x11perf/Imakefile @@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:08 cpqbld Exp $ -XCOMM $XFree86: xc/programs/x11perf/Imakefile,v 3.4 2001/01/17 23:45:10 dawes Exp $ +XCOMM $XFree86: xc/programs/x11perf/Imakefile,v 3.5 2001/03/30 02:15:23 keithp Exp $ #ifndef X11perfcompLib #define X11perfcompLib $(LIBDIR)/x11perfcomp @@ -36,6 +36,10 @@ LOCAL_LIBRARIES = $(XFTLIBS) $(XMUULIB) $(XLIB) DEPLIBS = $(XFTDEPS) $(DEPXMUULIB) $(DEPXLIB) SYS_LIBRARIES = MathLibrary +#if UseCygIPC +EXTRA_LIBRARIES = -lcygipc +#endif + #ifndef OS2Architecture ComplexProgramTarget(x11perf) |