luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-06 16:08:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Default to --disable-gtk-doc, to avoid Jade setup hassles.

Browse Source 
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:
Owen Taylor
2002-03-05 05:18:23 +00:00
committed by Owen Taylor
parent f79770257f
commit fc8fd6f8cb
31 changed files with 274 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gthread/Makefile.am
View File

@@ -19,20 +19,20 @@ BUILT_EXTRA_DIST = \
makefile.msc \
gthread.rc
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 = libgthread-1.3.la
lib_LTLIBRARIES = libgthread-2.0.la
if MS_LIB_AVAILABLE
noinst_DATA = gthread-1.3.lib
noinst_DATA = gthread-2.0.lib
install-ms-lib:
$(INSTALL) gthread-1.3.lib $(DESTDIR)$(libdir)
$(INSTALL) gthread-2.0.lib $(DESTDIR)$(libdir)
uninstall-ms-lib:
-rm $(DESTDIR)$(libdir)/gthread-1.3.lib
-rm $(DESTDIR)$(libdir)/gthread-2.0.lib
else
install-ms-lib:
uninstall-ms-lib:
@@ -46,30 +46,30 @@ if OS_WIN32
export_symbols = -export-symbols gthread.def
install-libtool-import-lib:
$(INSTALL) .libs/libgthread-1.3.dll.a $(DESTDIR)$(libdir)
$(INSTALL) .libs/libgthread-2.0.dll.a $(DESTDIR)$(libdir)
uninstall-libtool-import-lib:
-rm $(DESTDIR)$(libdir)/libgthread-1.3.dll.a
-rm $(DESTDIR)$(libdir)/libgthread-2.0.dll.a
else
install-libtool-import-lib:
uninstall-libtool-import-lib:
endif
libgthread_1_3_la_SOURCES = gthread-impl.c
libgthread_1_3_la_LDFLAGS = \
libgthread_2_0_la_SOURCES = gthread-impl.c
libgthread_2_0_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-export-dynamic $(no_undefined) $(export_symbols)
libgthread_1_3_la_LIBADD = @G_THREAD_WIN32_RESOURCE@ @G_THREAD_LIBS_EXTRA@ @G_THREAD_LIBS@ $(libglib)
libgthread_2_0_la_LIBADD = @G_THREAD_WIN32_RESOURCE@ @G_THREAD_LIBS_EXTRA@ @G_THREAD_LIBS@ $(libglib)
libgthread_1_3_la_DEPENDENCIES = @G_THREAD_WIN32_RESOURCE@ @GTHREAD_DEF@
libgthread_2_0_la_DEPENDENCIES = @G_THREAD_WIN32_RESOURCE@ @GTHREAD_DEF@
if OS_WIN32
@G_THREAD_WIN32_RESOURCE@ : gthread.rc
$(top_srcdir)/build/win32/lt-compile-resource gthread.rc @G_THREAD_WIN32_RESOURCE@
endif
gthread-1.3.lib: libgthread-1.3.la gthread.def
lib -name:libgthread-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gthread.def -out:$@
gthread-2.0.lib: libgthread-2.0.la gthread.def
lib -name:libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll -def:gthread.def -out:$@
gthread.rc: $(top_builddir)/config.status $(top_srcdir)/gthread/gthread.rc.in
cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status