mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2026-07-10 10:36:30 +02:00
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.
This commit is contained in:
+13
-13
@@ -29,20 +29,20 @@ glibincludedir=$(includedir)/glib-2.0
|
||||
glibinclude_HEADERS = \
|
||||
gmodule.h
|
||||
|
||||
libglib = $(top_builddir)/glib/libglib-1.3.la
|
||||
libglib = $(top_builddir)/glib/libglib-2.0.la
|
||||
|
||||
top_builddir_full=`cd \$(top_builddir); pwd`
|
||||
|
||||
lib_LTLIBRARIES = libgmodule-1.3.la
|
||||
lib_LTLIBRARIES = libgmodule-2.0.la
|
||||
|
||||
if MS_LIB_AVAILABLE
|
||||
noinst_DATA = gmodule-1.3.lib
|
||||
noinst_DATA = gmodule-2.0.lib
|
||||
|
||||
install-ms-lib:
|
||||
$(INSTALL) gmodule-1.3.lib $(DESTDIR)$(libdir)
|
||||
$(INSTALL) gmodule-2.0.lib $(DESTDIR)$(libdir)
|
||||
|
||||
uninstall-ms-lib:
|
||||
-rm $(DESTDIR)$(libdir)/gmodule-1.3.lib
|
||||
-rm $(DESTDIR)$(libdir)/gmodule-2.0.lib
|
||||
else
|
||||
install-ms-lib:
|
||||
uninstall-ms-lib:
|
||||
@@ -56,31 +56,31 @@ if OS_WIN32
|
||||
export_symbols = -export-symbols gmodule.def
|
||||
|
||||
install-libtool-import-lib:
|
||||
$(INSTALL) .libs/libgmodule-1.3.dll.a $(DESTDIR)$(libdir)
|
||||
$(INSTALL) .libs/libgmodule-2.0.dll.a $(DESTDIR)$(libdir)
|
||||
uninstall-libtool-import-lib:
|
||||
-rm $(DESTDIR)$(libdir)/libgmodule-1.3.dll.a
|
||||
-rm $(DESTDIR)$(libdir)/libgmodule-2.0.dll.a
|
||||
else
|
||||
install-libtool-import-lib:
|
||||
uninstall-libtool-import-lib:
|
||||
endif
|
||||
|
||||
libgmodule_1_3_la_SOURCES = gmodule.c
|
||||
libgmodule_1_3_la_LDFLAGS = \
|
||||
libgmodule_2_0_la_SOURCES = gmodule.c
|
||||
libgmodule_2_0_la_LDFLAGS = \
|
||||
@G_MODULE_LDFLAGS@ \
|
||||
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
|
||||
-export-dynamic $(no_undefined) $(export_symbols)
|
||||
|
||||
libgmodule_1_3_la_LIBADD = @G_MODULE_WIN32_RESOURCE@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_LIBS@ $(libglib)
|
||||
libgmodule_2_0_la_LIBADD = @G_MODULE_WIN32_RESOURCE@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_LIBS@ $(libglib)
|
||||
|
||||
libgmodule_1_3_la_DEPENDENCIES = @G_MODULE_WIN32_RESOURCE@ @GMODULE_DEF@
|
||||
libgmodule_2_0_la_DEPENDENCIES = @G_MODULE_WIN32_RESOURCE@ @GMODULE_DEF@
|
||||
|
||||
if OS_WIN32
|
||||
@G_MODULE_WIN32_RESOURCE@ : gmodule.rc
|
||||
$(top_srcdir)/build/win32/lt-compile-resource gmodule.rc @G_MODULE_WIN32_RESOURCE@
|
||||
endif
|
||||
|
||||
gmodule-1.3.lib: libgmodule-1.3.la gmodule.def
|
||||
lib -name:libgmodule-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gmodule.def -out:$@
|
||||
gmodule-2.0.lib: libgmodule-2.0.la gmodule.def
|
||||
lib -name:libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll -def:gmodule.def -out:$@
|
||||
|
||||
gmodule.rc: $(top_builddir)/config.status $(top_srcdir)/gmodule/gmodule.rc.in
|
||||
cd $(top_builddir) && CONFIG_FILES=gmodule/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
|
||||
Reference in New Issue
Block a user