diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-07 16:40:05 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-07 16:40:05 +0200 |
| commit | 8f0ed7f7a754df710b13b9dabbaa32b5d4211182 (patch) | |
| tree | 03bf52a933c29962894c2cec5f33028439cf4f5a /libXdmcp/test/Makefile.am | |
| parent | 7d29f4054380e7f42722c280b9caedce9fa4ace9 (diff) | |
| parent | 81fd17c8678e89cea6610b8b2996b028b21eb5dc (diff) | |
| download | vcxsrv-8f0ed7f7a754df710b13b9dabbaa32b5d4211182.tar.gz vcxsrv-8f0ed7f7a754df710b13b9dabbaa32b5d4211182.tar.bz2 vcxsrv-8f0ed7f7a754df710b13b9dabbaa32b5d4211182.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver fontconfig libXdmcp mesa pixmand xkeyboard-config git update 7 oct 2013
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/dix/privates.c
xorg-server/glx/glxcmds.c
xorg-server/hw/kdrive/ephyr/ephyr.h
xorg-server/hw/kdrive/ephyr/ephyrinit.c
xorg-server/hw/kdrive/ephyr/hostx.c
Diffstat (limited to 'libXdmcp/test/Makefile.am')
| -rw-r--r-- | libXdmcp/test/Makefile.am | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/libXdmcp/test/Makefile.am b/libXdmcp/test/Makefile.am new file mode 100644 index 000000000..d86719ed4 --- /dev/null +++ b/libXdmcp/test/Makefile.am @@ -0,0 +1,13 @@ +if ENABLE_UNIT_TESTS + +check_PROGRAMS = Array + +TESTS=$(check_PROGRAMS) + +AM_CFLAGS = $(CWARNFLAGS) $(XDMCP_CFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/include +LDADD= $(top_builddir)/libXdmcp.la $(XDMCP_LIBS) + +AM_TESTS_ENVIRONMENT = $(XORG_MALLOC_DEBUG_ENV) + +endif ENABLE_UNIT_TESTS |