Qt4 and GOMP intercepts are now always built, whether or not runtime support for...

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8387

diff --git a/drd/Makefile.am b/drd/Makefile.am
index 3a84697a9367a4e6af4e9a18a2a5506d6493c24c..03bb33eaa22fa84256fddb3017bf877a47d7c7cc 100644 (file)
--- a/drd/Makefile.am
+++ b/drd/Makefile.am
@@ -21,16 +21,10 @@ if VGP_PPC64_AIX5
 endif
 
 
-VGPRELOAD_DRD_SOURCES = drd_strmem_intercepts.c drd_pthread_intercepts.c \
-       $(VGPRELOAD_DRD_SOURCES_QT4) $(VGPRELOAD_DRD_SOURCES_OPENMP)
-
-if HAVE_QTCORE
+VGPRELOAD_DRD_SOURCES = drd_strmem_intercepts.c drd_pthread_intercepts.c
 VGPRELOAD_DRD_SOURCES += drd_qtcore_intercepts.c
-endif
-
-if HAVE_OPENMP
 VGPRELOAD_DRD_SOURCES += drd_gomp_intercepts.c
-endif
+
 
 DRD_CFLAGS=@FLAG_W_EXTRA@ @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@ \
            -Wformat-nonliteral -Wno-inline -Wno-unused-parameter \