aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nx-X11/programs/Xserver/os/Imakefile123
1 files changed, 91 insertions, 32 deletions
diff --git a/nx-X11/programs/Xserver/os/Imakefile b/nx-X11/programs/Xserver/os/Imakefile
index 8b260fa32..c2e1e8699 100644
--- a/nx-X11/programs/Xserver/os/Imakefile
+++ b/nx-X11/programs/Xserver/os/Imakefile
@@ -25,6 +25,8 @@
#include <Server.tmpl>
+NULL =
+
/*
* If you have any extra files to be put into the library, define them here.
*/
@@ -33,17 +35,18 @@
NX_INCLUDES = -I../../../../nxcomp
-NX_DEFINES = -DNX_TRANS_SOCKET \
- -DNX_TRANS_AUTH \
- -DNX_TRANS_FOPEN \
- -DNX_TRANS_SLEEP \
- -DNX_TRANS_EXIT \
- -DNX_TRANS_WAKEUP=1000
+NX_DEFINES = -DNX_TRANS_SOCKET \
+ -DNX_TRANS_AUTH \
+ -DNX_TRANS_FOPEN \
+ -DNX_TRANS_SLEEP \
+ -DNX_TRANS_EXIT \
+ -DNX_TRANS_WAKEUP=1000 \
+ $(NULL)
-# -DNX_TRANS_WARN \
-# -DNX_TRANS_INFO \
-# -DNX_TRANS_TEST \
-# -DNX_TRANS_DEBUG \
+# -DNX_TRANS_WARN \
+# -DNX_TRANS_INFO \
+# -DNX_TRANS_TEST \
+# -DNX_TRANS_DEBUG \
#endif
@@ -121,16 +124,51 @@ TMEMCMP_OBJS = timingsafe_memcmp.o
#endif
BOOTSTRAPCFLAGS =
- SRCS = WaitFor.c access.c connection.c io.c $(COLOR_SRCS) \
- osinit.c utils.c log.c auth.c mitauth.c secauth.c \
- $(XDMAUTHSRCS) $(RPCSRCS) xdmcp.c OtherSources \
- xstrans.c $(SNPRINTF_SRCS) $(STRLCAT_SRCS) \
- $(REALLOCARRAY_SRCS) xprintf.c $(TMEMCMP_SRCS)
- OBJS = WaitFor.o access.o connection.o io.o $(COLOR_OBJS) \
- osinit.o utils.o log.o auth.o mitauth.o secauth.o \
- $(XDMAUTHOBJS) $(RPCOBJS) xdmcp.o OtherObjects \
- xstrans.o $(SNPRINTF_OBJS) $(STRLCAT_OBJS) \
- $(REALLOCARRAY_OBJS) xprintf.o $(TMEMCMP_OBJS)
+ SRCS = WaitFor.c \
+ access.c \
+ connection.c \
+ io.c \
+ $(COLOR_SRCS) \
+ osinit.c \
+ utils.c \
+ log.c \
+ auth.c \
+ mitauth.c \
+ secauth.c \
+ $(XDMAUTHSRCS) \
+ $(RPCSRCS) \
+ xdmcp.c \
+ OtherSources \
+ xstrans.c \
+ $(SNPRINTF_SRCS) \
+ $(STRLCAT_SRCS) \
+ $(REALLOCARRAY_SRCS) \
+ xprintf.c \
+ $(TMEMCMP_SRCS) \
+ $(NULL)
+
+ OBJS = WaitFor.o \
+ access.o \
+ connection.o \
+ io.o \
+ $(COLOR_OBJS) \
+ osinit.o \
+ utils.o \
+ log.o \
+ auth.o \
+ mitauth.o \
+ secauth.o \
+ $(XDMAUTHOBJS) \
+ $(RPCOBJS) \
+ xdmcp.o \
+ OtherObjects \
+ xstrans.o \
+ $(SNPRINTF_OBJS) \
+ $(STRLCAT_OBJS) \
+ $(REALLOCARRAY_OBJS) \
+ xprintf.o \
+ $(TMEMCMP_OBJS) \
+ $(NULL)
#if UseMemLeak
MEM_DEFINES = -DMEMBUG
@@ -143,18 +181,39 @@ BOOTSTRAPCFLAGS =
#endif
XTRANS_DEFINES = -DXTRANS_SEND_FDS=0
- DEFINES = $(CONNECTION_FLAGS) $(MEM_DEFINES) \
- $(XDMAUTHDEFS) $(RPCDEFS) $(SIGNAL_DEFINES) $(OS_DEFINES) \
- $(GETPEER_DEFINES) \
- $(RANDOM_DEFINES) $(BUGMSG) $(XTRANS_FAILDEFINES) \
- $(XTRANS_DEFINES) $(NX_DEFINES)
- INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
- -I$(SERVERSRC)/Xext -I$(SERVERSRC)/render \
- -I$(TOP)/lib/Xau $(NX_INCLUDES) \
- `pkg-config --cflags-only-I pixman-1`
- DEPEND_DEFINES = $(XDMCP_DEFINES) $(EXT_DEFINES) \
- $(TRANS_INCLUDES) $(CONNECTION_FLAGS) $(GETPEER_DEFINES) \
- DependDefines
+ DEFINES = $(CONNECTION_FLAGS) \
+ $(MEM_DEFINES) \
+ $(XDMAUTHDEFS) \
+ $(RPCDEFS) \
+ $(SIGNAL_DEFINES) \
+ $(OS_DEFINES) \
+ $(GETPEER_DEFINES) \
+ $(RANDOM_DEFINES) \
+ $(BUGMSG) \
+ $(XTRANS_FAILDEFINES) \
+ $(XTRANS_DEFINES) \
+ $(NX_DEFINES) \
+ $(NULL)
+
+ INCLUDES = -I. \
+ -I../include \
+ -I$(XINCLUDESRC) \
+ -I$(EXTINCSRC) \
+ -I$(SERVERSRC)/Xext \
+ -I$(SERVERSRC)/render \
+ -I$(TOP)/lib/Xau \
+ $(NX_INCLUDES) \
+ `pkg-config --cflags-only-I pixman-1` \
+ $(NULL)
+
+ DEPEND_DEFINES = $(XDMCP_DEFINES) \
+ $(EXT_DEFINES) \
+ $(TRANS_INCLUDES) \
+ $(CONNECTION_FLAGS) \
+ $(GETPEER_DEFINES) \
+ DependDefines \
+ $(NULL)
+
LINTLIBS = ../dix/llib-ldix.ln
#ifdef NEED_ALLOCA_FROM_LIBPW