diff --git a/test/Makefile.am b/test/Makefile.am
index acd559c586778b669c5e5e664c9d1e4315de75ed..8515c6b091d90a136d8741081c5e8d6d38020610 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
lib_LTLIBRARIES = libdri2test.la
-libdri2test_la_SOURCES = dri2test.c
-libdri2test_la_LIBADD = @DRI2_LIBS@
-libdri2test_la_CFLAGS = $(CWARNFLAGS) -I$(top_srcdir)/include @DRI2_CFLAGS@
-
+COMMON_SOURCES = dri2util.c
+COMMON_LIBADD = @DRI2_LIBS@
+COMMON_CFLAGS = -g -O0 $(CWARNFLAGS) -I$(top_srcdir)/include @DRI2_CFLAGS@
if ENABLE_NOUVEAU
-libdri2test_la_SOURCES += dri2test-nouveau.c
-libdri2test_la_LIBADD += @NOUVEAU_LIBS@
-libdri2test_la_CFLAGS += @NOUVEAU_CFLAGS@
+COMMON_SOURCES += dri2-nouveau.c
+COMMON_LIBADD += @NOUVEAU_LIBS@
+COMMON_CFLAGS += @NOUVEAU_CFLAGS@
endif
if ENABLE_OMAP
-libdri2test_la_SOURCES += dri2test-omap.c
-libdri2test_la_LIBADD += @OMAP_LIBS@
-libdri2test_la_CFLAGS += @OMAP_CFLAGS@
+COMMON_SOURCES += dri2-omap.c
+COMMON_LIBADD += @OMAP_LIBS@
+COMMON_CFLAGS += @OMAP_CFLAGS@
endif
+
+libdri2test_la_SOURCES = dri2test.c $(COMMON_SOURCES)
+libdri2test_la_LIBADD = $(COMMON_LIBADD)
+libdri2test_la_CFLAGS = $(COMMON_CFLAGS)