Signed-off-by: Peter Hutterer <[email protected]> --- Actually, this one is enough, we don't need the STATIC patch. Can be squashed in withthe preevious PATCH 3/5.
src/xf86Wacom.h | 6 ++++++ test/Makefile.am | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/xf86Wacom.h b/src/xf86Wacom.h index 2fc8850..7f04a5c 100644 --- a/src/xf86Wacom.h +++ b/src/xf86Wacom.h @@ -38,6 +38,12 @@ #include <xf86Xinput.h> #include <mipointer.h> #include <X11/Xatom.h> +/***************************************************************************** + * Unit test hack + ****************************************************************************/ +#ifdef DISABLE_STATIC +#define static +#endif /****************************************************************************** * Debugging support diff --git a/test/Makefile.am b/test/Makefile.am index 01151de..1898fe3 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -3,7 +3,7 @@ include ../src/Makefile.am check_PROGRAMS = wacom-tests check_LTLIBRARRIES = @DRIVER_NAME@_drv.la -@DRIVER_NAME@_drv_la_CFLAGS = -DNO_STATIC -I$(top_srcdir)/src $(XORG_CFLAGS) $(CWARNFLAGS) -fvisibility=default +@DRIVER_NAME@_drv_la_CFLAGS = -DDISABLE_STATIC -I$(top_srcdir)/src $(XORG_CFLAGS) $(CWARNFLAGS) -fvisibility=default TESTS=$(check_PROGRAMS) -- 1.7.3.4 ------------------------------------------------------------------------------ Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
