Merge 0.30.214.

[util-vserver.git] / lib_internal / testsuite / Makefile-files

diff --git a/lib_internal/testsuite/Makefile-files b/lib_internal/testsuite/Makefile-files
index 26296e2..7bf6ddd 100644 (file)
--- a/lib_internal/testsuite/Makefile-files
+++ b/lib_internal/testsuite/Makefile-files
@@ -1,4 +1,4 @@
-## $Id: Makefile-files 2276 2006-01-22 18:24:22Z ensc $        --*- makefile -*--
+## $Id: Makefile-files 2569 2007-07-22 17:24:29Z dhozac $      --*- makefile -*--
 
 ## Copyright (C) 2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 ##  
@@ -23,23 +23,31 @@ check_PROGRAMS +=           lib_internal/testsuite/filecfg-ml \
                                lib_internal/testsuite/isnumber \
                                lib_internal/testsuite/isnumber-gnu \
                                lib_internal/testsuite/sigbus \
-                               lib_internal/testsuite/sigbus-gnu
+                               lib_internal/testsuite/sigbus-gnu \
+                               lib_internal/testsuite/matchlist \
+                               lib_internal/testsuite/matchlist-gnu
 TESTS +=                       lib_internal/testsuite/filecfg-ml \
                                lib_internal/testsuite/copy-check \
                                lib_internal/testsuite/isnumber \
                                lib_internal/testsuite/isnumber-gnu \
                                lib_internal/testsuite/sigbus \
-                               lib_internal/testsuite/sigbus-gnu
+                               lib_internal/testsuite/sigbus-gnu \
+                               lib_internal/testsuite/matchlist \
+                               lib_internal/testsuite/matchlist-gnu
 endif
 
 DIETPROGS +=                   lib_internal/testsuite/isnumber \
-                               lib_internal/testsuite/sigbus
+                               lib_internal/testsuite/sigbus \
+                               lib_internal/testsuite/matchlist
 
 EXTRA_DIST +=                  lib_internal/testsuite/copy-check
 
 TESTS_ENVIRONMENT +=           libinternaltestsuitedir=$(top_builddir)/lib_internal/testsuite
 
 
+# When building both a GNU and a dietlibc version, set target specific
+# CPPFLAGS to enforce separate compilation for both variants
+
 lib_internal_testsuite_command_SOURCES =       lib_internal/testsuite/command.c
 lib_internal_testsuite_command_LDADD =         $(LIBINTERNAL_GLIBC) \
                                                $(LIBENSCVECTOR_GLIBC)
@@ -52,9 +60,22 @@ lib_internal_testsuite_copy_LDADD =          $(LIBINTERNAL_GLIBC)
 
 lib_internal_testsuite_isnumber_SOURCES =      lib_internal/testsuite/isnumber.c
 lib_internal_testsuite_isnumber_LDADD =                $(LIBINTERNAL)
+lib_internal_testsuite_isnumber_CPPFLAGS =     $(AM_CPPFLAGS)          # see note above
 
 lib_internal_testsuite_isnumber_gnu_SOURCES =  lib_internal/testsuite/isnumber.c
 lib_internal_testsuite_isnumber_gnu_LDADD =    $(LIBINTERNAL_GLIBC)
+lib_internal_testsuite_isnumber_gnu_CPPFLAGS = $(AM_CPPFLAGS)          # see note above
 
 lib_internal_testsuite_sigbus_SOURCES =                lib_internal/testsuite/sigbus.c
+lib_internal_testsuite_sigbus_CPPFLAGS =       $(AM_CPPFLAGS)          # see note above
+
 lib_internal_testsuite_sigbus_gnu_SOURCES =    lib_internal/testsuite/sigbus.c
+lib_internal_testsuite_sigbus_gnu_CPPFLAGS =   $(AM_CPPFLAGS)          # see note above
+
+lib_internal_testsuite_matchlist_SOURCES =     lib_internal/testsuite/matchlist.c
+lib_internal_testsuite_matchlist_LDADD =       $(LIBINTERNAL)
+lib_internal_testsuite_matchlist_CPPFLAGS =    $(AM_CPPFLAGS)          # see note above
+
+lib_internal_testsuite_matchlist_gnu_SOURCES = lib_internal/testsuite/matchlist.c
+lib_internal_testsuite_matchlist_gnu_LDADD =   $(LIBINTERNAL_GLIBC)
+lib_internal_testsuite_matchlist_gnu_CPPFLAGS =        $(AM_CPPFLAGS)          # see note above