diff options
author | Mihai Moldovan <ionic@ionic.de> | 2016-06-25 01:35:40 +0200 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2016-06-25 01:35:40 +0200 |
commit | 975511c875674f097bbd2be33fa947a48d8c77c6 (patch) | |
tree | 207bba2c48054f551f19ed5aa89b9dd9616b8c60 /nx-X11/programs/Xserver/dix/Imakefile | |
parent | 9df153668423af868d0df739188a772fbc3356c6 (diff) | |
parent | a5befd4e20813910022ed771cb599f15bbf4664d (diff) | |
download | nx-libs-975511c875674f097bbd2be33fa947a48d8c77c6.tar.gz nx-libs-975511c875674f097bbd2be33fa947a48d8c77c6.tar.bz2 nx-libs-975511c875674f097bbd2be33fa947a48d8c77c6.zip |
Merge branch 'sunweaver-pr/hw-nxagent-drop-duplicate-Xserver-code_disable-Xserver-code-and-include-in-nxagent' into arctica-3.6.x
Attributes GH PR #120: https://github.com/ArcticaProject/nx-libs/pull/120
Diffstat (limited to 'nx-X11/programs/Xserver/dix/Imakefile')
-rw-r--r-- | nx-X11/programs/Xserver/dix/Imakefile | 92 |
1 files changed, 76 insertions, 16 deletions
diff --git a/nx-X11/programs/Xserver/dix/Imakefile b/nx-X11/programs/Xserver/dix/Imakefile index 20be46390..ed7530caf 100644 --- a/nx-X11/programs/Xserver/dix/Imakefile +++ b/nx-X11/programs/Xserver/dix/Imakefile @@ -1,10 +1,8 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:48:16 cpqbld Exp $ - - - - XCOMM $XFree86: xc/programs/Xserver/dix/Imakefile,v 3.17 2003/04/15 18:30:43 alanh Exp $ +NULL = + #include <Server.tmpl> XPSRC = xpstubs.c @@ -15,18 +13,80 @@ FFS_SRC = ffs.c FFS_OBJ = ffs.o #endif -SRCS = atom.c colormap.c cursor.c devices.c dispatch.c dixutils.c events.c \ - extension.c gc.c globals.c glyphcurs.c grabs.c \ - main.c property.c region.c resource.c swaprep.c swapreq.c \ - tables.c window.c initatoms.c dixfonts.c privates.c pixmap.c $(FFS_SRC) -OBJS = atom.o colormap.o cursor.o devices.o dispatch.o dixutils.o events.o \ - extension.o gc.o globals.o glyphcurs.o grabs.o \ - main.o property.o region.o resource.o swaprep.o swapreq.o \ - tables.o window.o initatoms.o dixfonts.o privates.o pixmap.o $(FFS_OBJ) - - INCLUDES = -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - -I$(SERVERSRC)/Xext -I$(SERVERSRC)/lbx \ - `pkg-config --cflags-only-I pixman-1` +#if (!(defined(NXAgentServer) && NXAgentServer)) +NXAGENT_SKIP_SRCS = \ + dispatch.c \ + dixfonts.c \ + events.c \ + extension.c \ + glyphcurs.c \ + property.c \ + resource.c \ + window.c \ + $(NULL) +NXAGENT_SKIP_OBJS = \ + dispatch.o \ + dixfonts.o \ + events.o \ + extension.o \ + glyphcurs.o \ + property.o \ + resource.o \ + window.o \ + $(NULL) +#endif + + +SRCS = \ + atom.c \ + colormap.c \ + cursor.c \ + devices.c \ + dixutils.c \ + gc.c \ + globals.c \ + grabs.c \ + main.c \ + region.c \ + swaprep.c \ + swapreq.c \ + tables.c \ + initatoms.c \ + privates.c \ + pixmap.c \ + $(NXAGENT_SKIP_SRCS) \ + $(FFS_SRC) \ + $(NULL) + +OBJS = \ + atom.o \ + colormap.o \ + cursor.o \ + devices.o \ + dixutils.o \ + gc.o \ + globals.o \ + grabs.o \ + main.o \ + region.o \ + swaprep.o \ + swapreq.o \ + tables.o \ + initatoms.o \ + privates.o \ + pixmap.o \ + $(NXAGENT_SKIP_OBJS) \ + $(FFS_OBJ) \ + $(NULL) + + INCLUDES = -I../include \ + -I$(XINCLUDESRC) \ + -I$(EXTINCSRC) \ + -I$(SERVERSRC)/Xext \ + -I$(SERVERSRC)/lbx \ + `pkg-config --cflags-only-I pixman-1` \ + $(NULL) + LINTLIBS = ../os/llib-los.ln /* |