luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

configure.in glib/Makefile.am Win32 cross-compilation fixes. (#163144, J.

Browse Source 
2005-01-06  Tor Lillqvist  <tml@iki.fi>

	* configure.in
	* glib/Makefile.am
	* gobject/Makefile.am: Win32 cross-compilation fixes. (#163144,
	J. Ali Harlow)
This commit is contained in:
Tor Lillqvist 2005-01-06 19:15:49 +00:00 committed by Tor Lillqvist
parent b687214a7c
commit bd77b4b4a9
8 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -4,6 +4,11 @@
* gobject/Makefile.am: glib.def and gobject.def are generated, not
in $(srcdir). (#163143, J. Ali Harlow)
* configure.in
* glib/Makefile.am
* gobject/Makefile.am: Win32 cross-compilation fixes. (#163144,
J. Ali Harlow)
2005-01-05 Matthias Clasen <mclasen@redhat.com>
* glib/gutils.h: Simplify the inlining magic to make it

5
ChangeLog.pre-2-10
View File

@ -4,6 +4,11 @@
* gobject/Makefile.am: glib.def and gobject.def are generated, not
in $(srcdir). (#163143, J. Ali Harlow)
* configure.in
* glib/Makefile.am
* gobject/Makefile.am: Win32 cross-compilation fixes. (#163144,
J. Ali Harlow)
2005-01-05 Matthias Clasen <mclasen@redhat.com>
* glib/gutils.h: Simplify the inlining magic to make it

5
ChangeLog.pre-2-12
View File

@ -4,6 +4,11 @@
* gobject/Makefile.am: glib.def and gobject.def are generated, not
in $(srcdir). (#163143, J. Ali Harlow)
* configure.in
* glib/Makefile.am
* gobject/Makefile.am: Win32 cross-compilation fixes. (#163144,
J. Ali Harlow)
2005-01-05 Matthias Clasen <mclasen@redhat.com>
* glib/gutils.h: Simplify the inlining magic to make it

5
ChangeLog.pre-2-6
View File

@ -4,6 +4,11 @@
* gobject/Makefile.am: glib.def and gobject.def are generated, not
in $(srcdir). (#163143, J. Ali Harlow)
* configure.in
* glib/Makefile.am
* gobject/Makefile.am: Win32 cross-compilation fixes. (#163144,
J. Ali Harlow)
2005-01-05 Matthias Clasen <mclasen@redhat.com>
* glib/gutils.h: Simplify the inlining magic to make it

5
ChangeLog.pre-2-8
View File

@ -4,6 +4,11 @@
* gobject/Makefile.am: glib.def and gobject.def are generated, not
in $(srcdir). (#163143, J. Ali Harlow)
* configure.in
* glib/Makefile.am
* gobject/Makefile.am: Win32 cross-compilation fixes. (#163144,
J. Ali Harlow)
2005-01-05 Matthias Clasen <mclasen@redhat.com>
* glib/gutils.h: Simplify the inlining magic to make it

5
configure.in
View File

@ -169,6 +169,11 @@ AC_SUBST(GTHREAD_DEF)
AC_SUBST(TESTGMODULE_EXP)
if test "$glib_native_win32" = "yes"; then
AC_CHECK_TOOL(NM, nm, no)
if [ "$NM" = no ]; then
AC_MSG_ERROR([*** Could not find an implementation of nm in your PATH.])
fi
AC_CHECK_TOOL(RANLIB, ranlib, :)
AC_CHECK_PROG(ms_librarian, [lib.exe], [yes], [no])
fi
AM_CONDITIONAL(MS_LIB_AVAILABLE, [test x$ms_librarian = xyes])

3
glib/Makefile.am
View File

@ -201,9 +201,10 @@ install-libtool-import-lib:
# directive in .def files.)
#
for entry in `grep PRIVATE glib.def | sed -e 's/PRIVATE//'`; do \
file=`nm -A .libs/libglib-2.0.dll.a | tr -d '\r' | grep -m 1 -E $$entry'$$' | cut -d: -f2`; \
file=`$(NM) -A .libs/libglib-2.0.dll.a | tr -d '\r' | grep -m 1 -E $$entry'$$' | cut -d: -f2`; \
ar d .libs/libglib-2.0.dll.a $$file; \
done
$(RANLIB) .libs/libglib-2.0.dll.a
$(INSTALL) .libs/libglib-2.0.dll.a $(DESTDIR)$(libdir)
$(INSTALL) glib.def $(DESTDIR)$(libdir)/glib-2.0.def

3
gobject/Makefile.am
View File

@ -54,9 +54,10 @@ install-libtool-import-lib:
# directive in .def files.)
#
for entry in `grep PRIVATE gobject.def | sed -e 's/PRIVATE//'`; do \
file=`nm -A .libs/libgobject-2.0.dll.a | grep -m 1 $$entry | cut -d: -f2`; \
file=`$(NM) -A .libs/libgobject-2.0.dll.a | grep -m 1 $$entry | cut -d: -f2`; \
ar d .libs/libgobject-2.0.dll.a $$file; \
done
$(RANLIB) .libs/libgobject-2.0.dll.a
$(INSTALL) .libs/libgobject-2.0.dll.a $(DESTDIR)$(libdir)
$(INSTALL) gobject.def $(DESTDIR)$(libdir)/gobject-2.0.def