diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-21 04:12:07 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-21 04:12:07 +0200 |
| commit | 17f3e3bc5157eeb6018ddaa6d862ca94f4b02b2b (patch) | |
| tree | 38cc2874f114bc6a564c9aa518196da93b1f67dc /nx-X11/programs/Xserver/randr/Imakefile | |
| parent | 9013a24da1830b445c03ba273e80774fd1d68fd7 (diff) | |
| parent | 4c8fc6be8f530d3bc84d1097bd2cb6a4af6c77fc (diff) | |
| download | nx-libs-17f3e3bc5157eeb6018ddaa6d862ca94f4b02b2b.tar.gz nx-libs-17f3e3bc5157eeb6018ddaa6d862ca94f4b02b2b.tar.bz2 nx-libs-17f3e3bc5157eeb6018ddaa6d862ca94f4b02b2b.zip | |
Merge branch 'sunweaver-pr/xrandr-extension-upgrade-1.5' into 3.6.x
Attributes GH PR #137: https://github.com/ArcticaProject/nx-libs/pull/137
Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Mon, 20 Jun 2016 12:40:52 -0700
Diffstat (limited to 'nx-X11/programs/Xserver/randr/Imakefile')
| -rw-r--r-- | nx-X11/programs/Xserver/randr/Imakefile | 49 |
1 files changed, 46 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/randr/Imakefile b/nx-X11/programs/Xserver/randr/Imakefile index 7f920aece..8dc8de1b7 100644 --- a/nx-X11/programs/Xserver/randr/Imakefile +++ b/nx-X11/programs/Xserver/randr/Imakefile @@ -17,18 +17,61 @@ XCOMM $XFree86: xc/programs/Xserver/randr/Imakefile,v 1.1 2001/05/23 03:29:44 keithp Exp $ #include <Server.tmpl> - SRCS = mirandr.c randr.c rrcrtc.c rrdispatch.c rrinfo.c rrmode.c rroutput.c rrpointer.c rrproperty.c rrscreen.c rrsdispatch.c rrxinerama.c + NULL = - OBJS = mirandr.o randr.o rrcrtc.o rrdispatch.o rrinfo.o rrmode.o rroutput.o rrpointer.o rrproperty.o rrscreen.o rrsdispatch.o rrxinerama.o + SRCS = randr.c \ + rrcrtc.c \ + rrdispatch.c \ + rrinfo.c \ + rrmode.c \ + rrmonitor.c \ + rroutput.c \ + rrpointer.c \ + rrproperty.c \ + rrprovider.c \ + rrproviderproperty.c \ + rrscreen.c \ + rrsdispatch.c \ + rrtransform.c \ + rrxinerama.c \ + $(NULL) + + OBJS = randr.o \ + rrcrtc.o \ + rrdispatch.o \ + rrinfo.o \ + rrmode.o \ + rrmonitor.o \ + rroutput.o \ + rrpointer.o \ + rrproperty.o \ + rrprovider.o \ + rrproviderproperty.o \ + rrscreen.o \ + rrsdispatch.o \ + rrtransform.o \ + rrxinerama.o \ + $(NULL) INCLUDES = -I../include -I../mi \ -I../fb -I../hw/kdrive -I$(EXTINCSRC) -I$(XINCLUDESRC) \ -I../render \ `pkg-config --cflags-only-I pixman-1` +#if defined(BuildXinerama) + PNRX_DEFINES = -DXINERAMA -DPANORAMIX +#endif + +#if defined(NXAgentServer) + NX_DEFINES = -DNXAGENT_SERVER +#endif + LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln - DEFINES = -DNXAGENT_SERVER + DEFINES = \ + $(PNRX_DEFINES) \ + $(NX_DEFINES) \ + $(NULL) NormalLibraryTarget(randr,$(OBJS)) NormalLibraryObjectRule() |