Add g_value_take_variant

[platform/upstream/glib.git] / tests / gobject / Makefile.am

diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am
index 09be339..a550979 100644 (file)
--- a/tests/gobject/Makefile.am
+++ b/tests/gobject/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.decl
+
 INCLUDES =                                     \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/glib                    \
@@ -9,6 +11,12 @@ libgthread = $(top_builddir)/gthread/libgthread-2.0.la
 libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la
 libgobject = $(top_builddir)/gobject/libgobject-2.0.la
 
+
+# libtool dependency tracking seems broken.  this is currently
+# required to get the tests to dynamic link against the in-tree
+# libglib instead of the system one
+libgobject += $(libglib)
+
 ########################################################################
 
 noinst_LTLIBRARIES = libtestgobject.la
@@ -29,12 +37,12 @@ endif
 testmarshal.h: stamp-testmarshal.h
        @true
 stamp-testmarshal.h: @REBUILD@ testmarshal.list $(glib_genmarshal)
-       $(glib_genmarshal) --prefix=test_marshal $(srcdir)/testmarshal.list --header >> xgen-gmh \
+       $(AM_V_GEN) $(glib_genmarshal) --prefix=test_marshal $(srcdir)/testmarshal.list --header >> xgen-gmh \
        && (cmp -s xgen-gmh testmarshal.h 2>/dev/null || cp xgen-gmh testmarshal.h) \
        && rm -f xgen-gmh xgen-gmh~ \
        && echo timestamp > $@
 testmarshal.c: @REBUILD@ testmarshal.list $(glib_genmarshal)
-       $(glib_genmarshal) --prefix=test_marshal $(srcdir)/testmarshal.list --body >> xgen-gmc \
+       $(AM_V_GEN) $(glib_genmarshal) --prefix=test_marshal $(srcdir)/testmarshal.list --body >> xgen-gmc \
        && cp xgen-gmc testmarshal.c \
        && rm -f xgen-gmc xgen-gmc~
 
@@ -43,7 +51,7 @@ CLEANFILES = stamp-testmarshal.h
 
 ########################################################################
 
-LDADD = libtestgobject.la $(libgobject) 
+LDADD = libtestgobject.la $(libgobject)
 
 test_programs =                                        \
        deftype                                 \
@@ -51,25 +59,30 @@ test_programs =                                     \
        paramspec-test                          \
        accumulator                             \
        defaultiface                            \
+       dynamictype                             \
        ifacecheck                              \
        ifaceinit                               \
        ifaceinherit                            \
        ifaceproperties                         \
        override                                \
+       performance                             \
+       performance-threaded                    \
        singleton                               \
        references
 
+performance_LDADD = $(libgobject) $(libgthread)
+performance_threaded_LDADD = $(libgobject) $(libgthread)
 check_PROGRAMS = $(test_programs)
 
 TESTS = $(test_programs)
 TESTS_ENVIRONMENT = srcdir=$(srcdir) \
        LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset \
        MALLOC_CHECK_=2 \
-       MALLOC_PERTURB_=$$(($$RANDOM % 256))
+       MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
 
 ########################################################################
 
-EXTRA_DIST =             \
+EXTRA_DIST +=            \
        testmarshal.list
 
 BUILT_EXTRA_DIST =                             \