Added method g_network_address_parse_uri()

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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index bde34d6..f6f527f 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,9 +3,7 @@ include $(top_srcdir)/Makefile.decl
 SUBDIRS=gobject refcount
 
 AM_CPPFLAGS =                          \
-       -I$(top_srcdir)                 \
-       -I$(top_srcdir)/glib            \
-       -I$(top_srcdir)/gmodule         \
+       $(gmodule_INCLUDES)             \
        $(GLIB_DEBUG_FLAGS)
 
 AM_CFLAGS = -g
@@ -95,8 +93,6 @@ test_programs =                                       \
        iochannel-test                          \
        mainloop-test                           \
        mapping-test                            \
-       markup-collect                          \
-       markup-escape-test                      \
        module-test                             \
        onceinit                                \
        asyncqueue-test                         \
@@ -114,9 +110,9 @@ test_programs =                                     \
        unicode-caseconv                        \
        unicode-encoding
 
-test_scripts = run-markup-tests.sh run-collate-tests.sh run-bookmark-test.sh run-assert-msg-test.sh
+test_scripts = run-collate-tests.sh run-assert-msg-test.sh
 
-test_script_support_programs = markup-test unicode-collate bookmarkfile-test
+test_script_support_programs = unicode-collate
 
 check_PROGRAMS = $(test_programs) $(test_script_support_programs)
 
@@ -132,7 +128,6 @@ module_ldadd = $(libgmodule) $(G_MODULE_LIBS) $(progs_ldadd)
 
 atomic_test_LDADD = $(progs_ldadd)
 bit_test_LDADD = $(progs_ldadd)
-bookmarkfile_test_LDADD = $(progs_ldadd)
 child_test_LDADD = $(thread_ldadd)
 completion_test_LDADD = $(progs_ldadd)
 date_test_LDADD = $(progs_ldadd)
@@ -143,9 +138,7 @@ gio_test_LDADD = $(progs_ldadd)
 iochannel_test_LDADD = $(progs_ldadd)
 list_test_LDADD = $(progs_ldadd)
 mainloop_test_LDADD = $(thread_ldadd)
-markup_test_LDADD = $(progs_ldadd)
 mapping_test_LDADD = $(progs_ldadd)
-markup_escape_test_LDADD = $(progs_ldadd)
 module_test_LDADD = $(module_ldadd) $(module_test_exp)
 module_test_LDFLAGS = $(G_MODULE_LDFLAGS)
 onceinit_LDADD = $(thread_ldadd)
@@ -167,7 +160,6 @@ type_test_LDADD = $(progs_ldadd)
 unicode_encoding_LDADD = $(progs_ldadd)
 unicode_caseconv_LDADD = $(progs_ldadd)
 unicode_collate_LDADD = $(progs_ldadd)
-markup_collect_LDADD = $(progs_ldadd)
 
 noinst_LTLIBRARIES = libmoduletestplugin_a.la libmoduletestplugin_b.la
 
@@ -184,15 +176,9 @@ dist-hook: $(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 
        mkdir $(distdir)/collate;                               \
        for f in $(srcdir)/collate/* ; do                       \
           if test -f $$f; then cp $$f $(distdir)/collate; fi; done
-       mkdir $(distdir)/bookmarks;                             \
-       for f in $(srcdir)/bookmarks/* ; do                     \
-         cp $$f $(distdir)/bookmarks; done 
 
 DISTCLEANFILES =               \
        iochannel-test-outfile  \