diff options
author | marha <marha@users.sourceforge.net> | 2013-11-14 08:33:57 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-11-14 08:33:57 +0100 |
commit | cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b (patch) | |
tree | 91ed73daada51bddd5652fd847f30b3593ecff04 /xorg-server/os/Makefile.am | |
parent | 6d8fefe38077f4d532c256e79cfcaf2a46c5269d (diff) | |
parent | 8fbb807d1029b012d2f45cb0f3ea0c6a6ebded6d (diff) | |
download | vcxsrv-cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b.tar.gz vcxsrv-cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b.tar.bz2 vcxsrv-cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xserver pixman git update 9 nov 2013
Conflicts:
mesalib/src/mesa/drivers/dri/common/dri_util.c
xorg-server/Xext/shm.c
Diffstat (limited to 'xorg-server/os/Makefile.am')
-rw-r--r-- | xorg-server/os/Makefile.am | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/xorg-server/os/Makefile.am b/xorg-server/os/Makefile.am index 364b6da2d..a1bbb4d1e 100644 --- a/xorg-server/os/Makefile.am +++ b/xorg-server/os/Makefile.am @@ -5,6 +5,7 @@ AM_CFLAGS = $(DIX_CFLAGS) $(SHA1_CFLAGS) SECURERPC_SRCS = rpcauth.c XDMCP_SRCS = xdmcp.c XORG_SRCS = log.c +BUSFAULT_SRCS = busfault.c libos_la_SOURCES = \ WaitFor.c \ @@ -39,6 +40,10 @@ AM_CFLAGS += $(LIBUNWIND_CFLAGS) libos_la_LIBADD += $(LIBUNWIND_LIBS) endif +if BUSFAULT +libos_la_SOURCES += $(BUSFAULT_SRCS) +endif + EXTRA_DIST = $(SECURERPC_SRCS) $(XDMCP_SRCS) if SPECIAL_DTRACE_OBJECTS |