diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-04 15:38:04 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-04 15:38:04 +0000 |
| commit | 3592ad31cfc72ffff3c9024eecea7d3b987c7954 (patch) | |
| tree | 0e3b50cb6bcd0839b591d318a41d04b7cbd8e6e2 /xorg-server/os/makefile | |
| parent | 79409465b0b8d5d38e6b94deb1943316f40c66eb (diff) | |
| parent | 0a5888393c68f6f7db86206d1f277232db18240b (diff) | |
| download | vcxsrv-3592ad31cfc72ffff3c9024eecea7d3b987c7954.tar.gz vcxsrv-3592ad31cfc72ffff3c9024eecea7d3b987c7954.tar.bz2 vcxsrv-3592ad31cfc72ffff3c9024eecea7d3b987c7954.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/os/makefile')
| -rw-r--r-- | xorg-server/os/makefile | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/xorg-server/os/makefile b/xorg-server/os/makefile index e7a286970..779a1c95d 100644 --- a/xorg-server/os/makefile +++ b/xorg-server/os/makefile @@ -1,21 +1,28 @@ +LIBRARY=libos
+
ifeq ($(DEBUG),1)
DEFINES += XSERVER_DTRACE
endif
+SECURE_RPC=1
+XDMCP=1
+NEED_STRLCAT=1
SECURERPC_SRCS = rpcauth.c
XDMCP_SRCS = xdmcp.c
STRLCAT_SRCS = strlcat.c strlcpy.c
XORG_SRCS = log.c
-CSRCS = \
+libos_la_SOURCES = \
WaitFor.c \
access.c \
auth.c \
backtrace.c \
+ client.c \
connection.c \
io.c \
mitauth.c \
oscolor.c \
+ osdep.h \
osinit.c \
utils.c \
strcasecmp.c \
@@ -26,11 +33,17 @@ CSRCS = \ xprintf.c \
$(XORG_SRCS)
-CSRCS += $(SECURERPC_SRCS)
+if SECURE_RPC
+libos_la_SOURCES += $(SECURERPC_SRCS)
+endif
+if XDMCP
+libos_la_SOURCES += $(XDMCP_SRCS)
+endif
-CSRCS += $(XDMCP_SRCS)
+if NEED_STRLCAT
+libos_la_SOURCES += $(STRLCAT_SRCS)
+endif
-CSRCS += $(STRLCAT_SRCS)
+CSRCS = $(filter %.c,$(libos_la_SOURCES))
-LIBRARY=libos
|