diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-07-14 19:22:54 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-07-14 19:22:54 +0000 |
| commit | eb023508ad933fba5a5542ce2927d784a9c982a2 (patch) | |
| tree | e1e26264f7be2bab3d5e76274b55810ae20901dd /tests | |
| parent | f4e591eb7b9df60576646d873fc9dbac1bb1278a (diff) | |
| download | glib-eb023508ad933fba5a5542ce2927d784a9c982a2.tar.gz | |
Move glib-config to glib-config-2.0 move glib.m4 to glib-2.0.m4
Fri Jul 14 12:22:49 2000 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.am glib-config.m4 glib.m4: Move
glib-config to glib-config-2.0 move glib.m4 to
glib-2.0.m4
* Makefile.am gobject/Makefile.am gmodule/Makefile.am
gthread/Makefile.am tests/Makefile.am: Change
library names to libglib-1.3.la, etc, so that we
can distinguish glib-1.2 and glib-2.0 on the linkline.
* Makefile.am gobject/Makefile.am gmodule/Makefile.am:
Move include files into /usr/include/glib-2.0.
Thu Jul 6 18:54:49 2000 Owen Taylor <otaylor@redhat.com>
* docs/Makefile.am (EXTRA_DIST): Remove info files
from the build.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 81aaf62ea..f96d38bc2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -27,24 +27,25 @@ TESTS = \ 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 -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@ -threadpool_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 +progs_LDADD = $(top_builddir)/libglib-1.3.la +thread_LDADD = $(progs_LDADD) $(top_builddir)/gthread/libgthread-1.3.la @G_THREAD_LIBS@ + +array_test_LDADD = $(progs_LDADD) +date_test_LDADD = $(progs_LDADD) +dirname_test_LDADD = $(progs_LDADD) +hash_test_LDADD = $(progs_LDADD) +list_test_LDADD = $(progs_LDADD) +node_test_LDADD = $(progs_LDADD) +queue_test_LDADD = $(progs_LDADD) +rand_test_LDADD = $(progs_LDADD) +relation_test_LDADD = $(progs_LDADD) +slist_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) makefile.msc: $(top_builddir)/config.status $(top_srcdir)/tests/makefile.msc.in cd $(top_builddir) && CONFIG_FILES=tests/$@ CONFIG_HEADERS= $(SHELL) ./config.status |