tests/closure: Fix invalid unref

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

diff --git a/gobject/tests/Makefile.am b/gobject/tests/Makefile.am
index 28a52b2..78895ff 100644 (file)
--- a/gobject/tests/Makefile.am
+++ b/gobject/tests/Makefile.am
@@ -1,14 +1,50 @@
-include $(top_srcdir)/Makefile.decl
+include $(top_srcdir)/glib.mk
 
-INCLUDES = -g -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_builddir)/glib $(GLIB_DEBUG_FLAGS)
+LDADD = ../libgobject-2.0.la $(top_builddir)/glib/libglib-2.0.la
+AM_CPPFLAGS = -g $(gobject_INCLUDES) $(GLIB_DEBUG_FLAGS)
+DEFS = -DG_LOG_DOMAIN=\"GLib-GObject\"
+AM_CFLAGS = $(GLIB_WARN_CFLAGS)
 
-noinst_PROGRAMS  = $(TEST_PROGS)
-libgobject_LDADD = ../libgobject-2.0.la $(top_builddir)/gthread/libgthread-2.0.la $(top_builddir)/glib/libglib-2.0.la
+# -----------------------------------------------------------------------------
 
-TEST_PROGS             += threadtests dynamictests binding
-threadtests_SOURCES    = threadtests.c
-threadtests_LDADD      = $(libgobject_LDADD)
-dynamictests_SOURCES   = dynamictests.c
-dynamictests_LDADD     = $(libgobject_LDADD)
-binding_SOURCES                = binding.c
-binding_LDADD          = $(libgobject_LDADD)
+test_programs = \
+       qdata                           \
+       boxed                           \
+       enums                           \
+       param                           \
+       threadtests                     \
+       dynamictests                    \
+       binding                         \
+       properties                      \
+       reference                       \
+       valuearray                      \
+       type                            \
+       private                         \
+       closure                         \
+       $(NULL)
+
+# -----------------------------------------------------------------------------
+
+test_programs += ifaceproperties
+ifaceproperties_SOURCES = ifaceproperties.c testcommon.h
+
+# -----------------------------------------------------------------------------
+
+test_programs += signals
+signals_SOURCES = signals.c
+nodist_signals_SOURCES = marshalers.c marshalers.h
+signals.o: marshalers.h
+CLEANFILES += marshalers.h marshalers.c
+EXTRA_DIST += marshalers.list
+
+if CROSS_COMPILING
+  glib_genmarshal=$(GLIB_GENMARSHAL)
+else
+  glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal
+endif
+
+marshalers.h: Makefile.am marshalers.list
+       $(AM_V_GEN) $(glib_genmarshal) --prefix=test $(srcdir)/marshalers.list --header --valist-marshallers > marshalers.h
+
+marshalers.c: Makefile.am marshalers.h marshalers.list
+       $(AM_V_GEN) (echo "#include \"marshalers.h\""; $(glib_genmarshal) --prefix=test $(srcdir)/marshalers.list --body --valist-marshallers) > $@.tmp && mv $@.tmp $@