diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-03-05 05:18:23 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-03-05 05:18:23 +0000 |
| commit | fc8fd6f8cb01ac93933d372e8056765de04092ae (patch) | |
| tree | 2954e6ec27bf4f8e2df2c69182590fc2d2943eab /tests | |
| parent | f79770257f96afa8f572e69241957265ef3886e0 (diff) | |
Default to --disable-gtk-doc, to avoid Jade setup hassles.
Sun Mar 3 21:09:24 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Default to --disable-gtk-doc, to avoid
Jade setup hassles.
* autogen.sh: Add --enable-gtk-doc.
* configure.in: Default to --disable-static to go
along with Pango, GTK+ where we need to do that for
bin-compat reasons.
* Makefile.am: Add a slightly modified distcheck rule
that passes --enable-gtk-doc to the configure inside.
(So that 'make dist' succeeds inside.)
* configure.in *.pc.in **/Makefile.am m4macros/glib-2.0.m4
tests/makefile.mingw.in: Switch everything over to
glib-2.0.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 8 | ||||
| -rw-r--r-- | tests/makefile.mingw.in | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index c9c7fb8cd..59d08313e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,10 +2,10 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gmodule @GLIB_DE EFENCE= -libglib = $(top_builddir)/glib/libglib-1.3.la -libgthread = $(top_builddir)/gthread/libgthread-1.3.la -libgmodule = $(top_builddir)/gmodule/libgmodule-1.3.la -libgobject = $(top_builddir)/gobject/libgobject-1.3.la +libglib = $(top_builddir)/glib/libglib-2.0.la +libgthread = $(top_builddir)/gthread/libgthread-2.0.la +libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la +libgobject = $(top_builddir)/gobject/libgobject-2.0.la if PLATFORM_WIN32 libadd_libgmodule = $(libgmodule) diff --git a/tests/makefile.mingw.in b/tests/makefile.mingw.in index c666e251f..ed9a791cf 100644 --- a/tests/makefile.mingw.in +++ b/tests/makefile.mingw.in @@ -56,20 +56,20 @@ all: $(TESTS) $(NONAUTOMATIC_TESTS) $(DLLS) .SUFFIXES: .c .i .exe .c.exe: - $(CC) $(CFLAGS) -o $@ $< -L ../gthread -lgthread-1.3 -L ../glib -lglib-1.3 + $(CC) $(CFLAGS) -o $@ $< -L ../gthread -lgthread-2.0 -L ../glib -lglib-2.0 module-test.exe : module-test.o - $(CC) $(CFLAGS) -Wl,--base-file,module-test.base -o module-test.exe module-test.o -L ../glib -lglib-1.3 -L ../gmodule -lgmodule-1.3 $(LDFLAGS) + $(CC) $(CFLAGS) -Wl,--base-file,module-test.base -o module-test.exe module-test.o -L ../glib -lglib-2.0 -L ../gmodule -lgmodule-2.0 $(LDFLAGS) $(DLLTOOL) --base-file module-test.base --output-exp module-test.exp module-test.o - $(CC) $(CFLAGS) -Wl,--base-file,module-test.base,module-test.exp -o module-test.exe module-test.o -L ../glib -lglib-1.3 -L ../gmodule -lgmodule-1.3 $(LDFLAGS) + $(CC) $(CFLAGS) -Wl,--base-file,module-test.base,module-test.exp -o module-test.exe module-test.o -L ../glib -lglib-2.0 -L ../gmodule -lgmodule-2.0 $(LDFLAGS) $(DLLTOOL) --base-file module-test.base --output-exp module-test.exp module-test.o - $(CC) $(CFLAGS) -Wl,module-test.exp -o module-test.exe module-test.o -L ../glib -lglib-1.3 -L ../gmodule -lgmodule-1.3 $(LDFLAGS) + $(CC) $(CFLAGS) -Wl,module-test.exp -o module-test.exe module-test.o -L ../glib -lglib-2.0 -L ../gmodule -lgmodule-2.0 $(LDFLAGS) libmoduletestplugin_a.dll : libmoduletestplugin_a.o - $(BUILD_DLL) libmoduletestplugin_a - libmoduletestplugin_a.o -L ../glib -lglib-1.3 -L ../gmodule -lgmodule-1.3 + $(BUILD_DLL) libmoduletestplugin_a - libmoduletestplugin_a.o -L ../glib -lglib-2.0 -L ../gmodule -lgmodule-2.0 libmoduletestplugin_b.dll : libmoduletestplugin_b.o - $(BUILD_DLL) libmoduletestplugin_b - libmoduletestplugin_b.o -L ../glib -lglib-1.3 -L ../gmodule -lgmodule-1.3 + $(BUILD_DLL) libmoduletestplugin_b - libmoduletestplugin_b.o -L ../glib -lglib-2.0 -L ../gmodule -lgmodule-2.0 check: all @for P in $(TESTS) ; do echo $$P; PATH=../glib:../gmodule:../gobject:../gthread:$$PATH ./$$P; done |