-I$(top_srcdir)/gmodule, fix from Michael Meeks

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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index cd59973..756e1b7 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,51 +1,103 @@
 
-INCLUDES = -I$(top_srcdir) @GLIB_DEBUG_FLAGS@
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gmodule @GLIB_DEBUG_FLAGS@
+
+EFENCE=
 
 EXTRA_DIST = \
+       $(test_scripts)         \
+       makefile.msc.in         \
+       makefile.mingw.in
+
+BUILT_EXTRA_DIST = \
        makefile.msc    \
-       makefile.cygwin
+       makefile.mingw
 
-TESTS = \
+test_programs = \
        array-test      \
        date-test       \
        dirname-test    \
+       gio-test        \
        hash-test       \
        list-test       \
+       mainloop-test   \
+       module-test     \
        node-test       \
        queue-test      \
        rand-test       \
        relation-test   \
+       shell-test      \
        slist-test      \
-       stack-test      \
+       spawn-test      \
        strfunc-test    \
        string-test     \
        thread-test     \
+       threadpool-test \
        tree-test       \
        type-test
 
-noinst_PROGRAMS = $(TESTS)
-
-array_test_LDADD = $(top_builddir)/libglib.la
-date_test_LDADD = $(top_builddir)/libglib.la
-dirname_test_LDADD = $(top_builddir)/libglib.la
-hash_test_LDADD = $(top_builddir)/libglib.la
-list_test_LDADD = $(top_builddir)/libglib.la
-node_test_LDADD = $(top_builddir)/libglib.la
-queue_test_LDADD = $(top_builddir)/libglib.la
-rand_test_LDADD = $(top_builddir)/libglib.la
-relation_test_LDADD = $(top_builddir)/libglib.la
-slist_test_LDADD = $(top_builddir)/libglib.la
-stack_test_LDADD = $(top_builddir)/libglib.la
-strfunc_test_LDADD = $(top_builddir)/libglib.la
-string_test_LDADD = $(top_builddir)/libglib.la
-thread_test_LDADD = $(top_builddir)/libglib.la \
-               $(top_builddir)/gthread/libgthread.la @G_THREAD_LIBS@
-tree_test_LDADD = $(top_builddir)/libglib.la
-type_test_LDADD = $(top_builddir)/libglib.la
+test_scripts = run-markup-tests.sh
+
+test_script_support_programs = markup-test
+
+check_PROGRAMS = $(test_programs) $(test_script_support_programs)
+
+TESTS = $(test_programs) $(test_scripts)
+TESTS_ENVIRONMENT = srcdir=$(srcdir)
+
+progs_LDADD = $(EFENCE) $(top_builddir)/libglib-1.3.la $(EFENCE)
+thread_LDADD = $(progs_LDADD) $(top_builddir)/gthread/libgthread-1.3.la @G_THREAD_LIBS@
+module_LDADD = $(progs_LDADD) $(top_builddir)/gmodule/libgmodule-1.3.la @G_MODULE_LIBS@
+
+array_test_LDADD = $(progs_LDADD)
+date_test_LDADD = $(progs_LDADD)
+dirname_test_LDADD = $(progs_LDADD)
+gio_test_LDADD = $(progs_LDADD)
+hash_test_LDADD = $(progs_LDADD)
+list_test_LDADD = $(progs_LDADD)
+mainloop_test_LDADD = $(thread_LDADD)
+markup_test_LDADD = $(progs_LDADD)
+module_test_LDADD = $(module_LDADD)
+module_test_LDFLAGS = @G_MODULE_LDFLAGS@
+node_test_LDADD = $(progs_LDADD)
+queue_test_LDADD = $(progs_LDADD)
+rand_test_LDADD = $(progs_LDADD)
+relation_test_LDADD = $(progs_LDADD)
+shell_test_LDADD = $(progs_LDADD)
+slist_test_LDADD = $(progs_LDADD)
+spawn_test_LDADD = $(progs_LDADD)
+strfunc_test_LDADD = $(progs_LDADD)
+string_test_LDADD = $(progs_LDADD)
+thread_test_LDADD = $(thread_LDADD)
+threadpool_test_LDADD = $(thread_LDADD)
+tree_test_LDADD = $(progs_LDADD)
+type_test_LDADD = $(progs_LDADD)
+
+lib_LTLIBRARIES = libmoduletestplugin_a.la libmoduletestplugin_b.la
+
+# Prevent those libs from being installed
+install-libLTLIBRARIES:
+       :
+
+libmoduletestplugin_a_la_SOURCES = libmoduletestplugin_a.c
+libmoduletestplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module
+libmoduletestplugin_a_la_LIBADD = @G_MODULE_LIBS@ 
+
+libmoduletestplugin_b_la_SOURCES = libmoduletestplugin_b.c
+libmoduletestplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module
+libmoduletestplugin_b_la_LIBADD = @G_MODULE_LIBS@  
 
 makefile.msc: $(top_builddir)/config.status $(top_srcdir)/tests/makefile.msc.in
        cd $(top_builddir) && CONFIG_FILES=tests/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-makefile.cygwin: $(top_builddir)/config.status $(top_srcdir)/tests/makefile.cygwin.in
+makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/tests/makefile.mingw.in
        cd $(top_builddir) && CONFIG_FILES=tests/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
+dist-hook: $(BUILT_EXTRA_DIST)
+       files='$(BUILT_EXTRA_DIST)'; \
+       for f in $$files; do \
+         if test -f $$f; then d=.; else d=$(srcdir); fi; \
+         cp $$d/$$f $(distdir) || exit 1; done
+       mkdir $(distdir)/markups;          \
+       for f in $(srcdir)/markups/* ; do  \
+         cp $$f $(distdir)/markups;       \
+       done