include $(top_srcdir)/Makefile.decl
-INCLUDES = -g -I$(top_srcdir) -I$(top_srcdir)/glib $(GLIB_DEBUG_FLAGS)
+INCLUDES = -g $(gobject_INCLUDES) $(GLIB_DEBUG_FLAGS)
+
+if CROSS_COMPILING
+ glib_genmarshal=$(GLIB_GENMARSHAL)
+else
+ glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal
+endif
noinst_PROGRAMS = $(TEST_PROGS)
-libgobject_LDADD = ../libgobject-2.0.la $(top_builddir)/gthread/libgthread-2.0.la $(top_builddir)/glib/libglib-2.0.la
+LDADD = ../libgobject-2.0.la $(top_builddir)/gthread/libgthread-2.0.la $(top_builddir)/glib/libglib-2.0.la
+
+TEST_PROGS += \
+ boxed \
+ enums \
+ param \
+ signals \
+ threadtests \
+ dynamictests \
+ binding \
+ properties \
+ reference \
+ ifaceproperties \
+ valuearray
+
+signals_SOURCES = signals.c marshalers.c
+
+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.list
+ $(AM_V_GEN) $(glib_genmarshal) --prefix=test $(srcdir)/marshalers.list --body --valist-marshallers > marshalers.c
+
+BUILT_SOURCES = marshalers.h marshalers.c
+CLEANFILES = marshalers.h marshalers.c
+
+ifaceproperties_SOURCES = ifaceproperties.c testcommon.h
-TEST_PROGS += threadtests dynamictests
-threadtests_SOURCES = threadtests.c
-threadtests_LDADD = $(libgobject_LDADD)
-dynamictests_SOURCES = dynamictests.c
-dynamictests_LDADD = $(libgobject_LDADD)
+EXTRA_DIST += marshalers.list