diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-04 13:54:03 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-04 13:54:03 +0000 |
| commit | 0a5888393c68f6f7db86206d1f277232db18240b (patch) | |
| tree | 9afe740e7b124ea8d2125ef7be0d42760d3b8e6a /xorg-server/os/Makefile.am | |
| parent | 56950d7bed70ee82186f44f9333537cdbb33c448 (diff) | |
| download | vcxsrv-0a5888393c68f6f7db86206d1f277232db18240b.tar.gz vcxsrv-0a5888393c68f6f7db86206d1f277232db18240b.tar.bz2 vcxsrv-0a5888393c68f6f7db86206d1f277232db18240b.zip | |
xserver xkeyboard-config mesa git update 4 Marc 2011
Diffstat (limited to 'xorg-server/os/Makefile.am')
| -rw-r--r-- | xorg-server/os/Makefile.am | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/xorg-server/os/Makefile.am b/xorg-server/os/Makefile.am index 3e4f2c591..91ca110f4 100644 --- a/xorg-server/os/Makefile.am +++ b/xorg-server/os/Makefile.am @@ -1,25 +1,18 @@ -noinst_LTLIBRARIES = libos.la liblog.la +noinst_LTLIBRARIES = libos.la AM_CFLAGS = $(DIX_CFLAGS) $(SHA1_CFLAGS) SECURERPC_SRCS = rpcauth.c XDMCP_SRCS = xdmcp.c STRLCAT_SRCS = strlcat.c strlcpy.c - -# Build a convenience library liblog.la that will be added into -# libos.la. The split is done so that log.c can be built with -# different compiler options. -liblog_la_SOURCES = log.c -# Add flags needed for proper backtraces of functions marked with GCC -# __attribute__((noreturn)). Currently those flags are needed for -# FatalError and AbortServer in log.c. -liblog_la_CFLAGS = $(AM_CFLAGS) $(ARM_BACKTRACE_CFLAGS) +XORG_SRCS = log.c libos_la_SOURCES = \ WaitFor.c \ access.c \ auth.c \ backtrace.c \ + client.c \ connection.c \ io.c \ mitauth.c \ @@ -32,8 +25,9 @@ libos_la_SOURCES = \ xdmauth.c \ xsha1.c \ xstrans.c \ - xprintf.c -libos_la_LIBADD = @SHA1_LIBS@ $(DLOPEN_LIBS) liblog.la + xprintf.c \ + $(XORG_SRCS) +libos_la_LIBADD = @SHA1_LIBS@ $(DLOPEN_LIBS) if SECURE_RPC libos_la_SOURCES += $(SECURERPC_SRCS) |