[Libreoffice-commits] .: glib/glib-2.28.1-win32.patch glib/makefile.mk

[Tor Lillqvist]

 glib/glib-2.28.1-win32.patch |   20 ++++++++++----------
 glib/makefile.mk             |   10 +++++-----
 2 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 9d4abcf0035adb14ff46cd8acd9c71c3a75943f0
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jun 3 14:05:13 2011 +0300

    Make the GLib DLL names even more unique

diff --git a/glib/glib-2.28.1-win32.patch b/glib/glib-2.28.1-win32.patch
index a6fc48f..c33955e 100644
--- a/glib/glib-2.28.1-win32.patch
+++ b/glib/glib-2.28.1-win32.patch
@@ -328,7 +328,7 @@
  	gioenumtypes.h		\
  	gioenumtypes.c		\
 -	libgio-$(PKG_VER)-0.dll
-+	gio-$(PKG_VER).dll
++	giolo.dll
  
  
  $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
@@ -346,7 +346,7 @@
  
 -libgio-$(PKG_VER)-0.dll : $(OBJECTS) win32\giowin32.lib $(PACKAGE).def $(RESOURCE)
 -	$(CC) $(CFLAGS) -LD -Felibgio-$(PKG_VER)-0.dll $(OBJECTS) $(RESOURCE) \
-+gio-$(PKG_VER).dll : $(OBJECTS) win32\giowin32.lib gvdb\giogvdb.lib $(PACKAGE).def $(RESOURCE) 
++giolo.dll : $(OBJECTS) win32\giowin32.lib gvdb\giogvdb.lib $(PACKAGE).def $(RESOURCE) 
 +	$(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(RESOURCE) \
  	..\glib\glib-2.0.lib ..\gobject\gobject-2.0.lib ..\gmodule\gmodule-2.0.lib \
 -	win32\giowin32.lib \
@@ -399,7 +399,7 @@
  	gnulib\gnulib.lib	\
  	pcre\pcre.lib		\
 -	libglib-2.0-0.dll \
-+	glib-2.0.dll \
++	gliblo.dll \
 -	glib-2.28s.lib \
 -	gspawn-win32-helper.exe	\
 -	gspawn-win32-helper-console.exe	\
@@ -508,7 +508,7 @@
  	lib /out:glib-2.28s.lib $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib
  
 -libglib-2.0-0.dll : $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib glib.def glib.res
-+glib-2.0.dll : $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib glib.def glib.res 
++gliblo.dll : $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib glib.def glib.res 
  	$(CC) $(CFLAGS) -LD -Fe$@ $(glib_OBJECTS) glib.res $(INTL_LIBS) \
  	gnulib\gnulib.lib pcre\pcre.lib $(DIRENT_LIBS) user32.lib advapi32.lib shell32.lib wsock32.lib ole32.lib ws2_32.lib \
  	$(LDFLAGS) /implib:glib-2.0.lib /def:glib.def
@@ -578,7 +578,7 @@
  all : \
  	gmoduleconf.h \
 -	libgmodule-2.0-0.dll
-+	gmodule-2.0.dll
++	gmodulelo.dll
  
  gmodule_OBJECTS = \
  	gmodule.obj
@@ -608,7 +608,7 @@
 +	rc -DBUILDNUMBER=0 -r -i $(SOLARINC) -fo gmodule.res gmodule.rc
  
 -libgmodule-2.0-0.dll : $(gmodule_OBJECTS) gmodule.def gmodule.res
-+gmodule-2.0.dll : $(gmodule_OBJECTS) gmodule.def gmodule.res
++gmodulelo.dll : $(gmodule_OBJECTS) gmodule.def gmodule.res
  	$(CC) $(CFLAGS) -LD -Fe$@ $(gmodule_OBJECTS) gmodule.res \
  	..\glib\glib-2.0.lib $(LDFLAGS) /implib:gmodule-2.0.lib /def:gmodule.def
  
@@ -637,7 +637,7 @@
  	gmarshal.strings \
 -	gobject-query.exe \
 -	libgobject-2.0-0.dll	\
-+	gobject-2.0.dll	\
++	gobjectlo.dll	\
  	gobject-2.28s.lib \
 -	testgobject.exe
  
@@ -666,7 +666,7 @@
 +	cp xgen-gmh gmarshal.h
  
 -libgobject-2.0-0.dll : $(gobject_OBJECTS) gobject.def gobject.res
-+gobject-2.0.dll : $(gobject_OBJECTS) gobject.def gobject.res
++gobjectlo.dll : $(gobject_OBJECTS) gobject.def gobject.res
  	$(CC) $(CFLAGS) -Fm -LD -Fe$@ $(gobject_OBJECTS) gobject.res \
 -	..\glib\glib-2.0.lib $(LDFLAGS) /implib:gobject-2.0.lib /def:gobject.def || del $@
 +	..\glib\glib-2.0.lib ..\gthread\gthread-2.0.lib $(LDFLAGS) /implib:gobject-2.0.lib /def:gobject.def || rm $@
@@ -684,7 +684,7 @@
  DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\"
  all : \
 -	libgthread-2.0-0.dll
-+	gthread-2.0.dll
++	gthreadlo.dll
  
  gthread_OBJECTS = \
  	gthread-impl.obj
@@ -696,7 +696,7 @@
 +	rc -DBUILDNUMBER=0 -r -i $(SOLARINC) -fo gthread.res gthread.rc
  
 -libgthread-2.0-0.dll : $(gthread_OBJECTS) gthread.def gthread.res
-+gthread-2.0.dll : $(gthread_OBJECTS) gthread.def gthread.res
++gthreadlo.dll : $(gthread_OBJECTS) gthread.def gthread.res
  	$(CC) $(CFLAGS) -LD -Fe$@ $(gthread_OBJECTS) gthread.res \
  	..\glib\glib-2.0.lib $(DEPCLIBS) user32.lib $(LDFLAGS) /implib:gthread-2.0.lib /def:gthread.def
 --- misc/glib-2.28.1/makefile.msc	2009-04-01 01:04:20.000000000 +0200
diff --git a/glib/makefile.mk b/glib/makefile.mk
index d228187..18e180c 100644
--- a/glib/makefile.mk
+++ b/glib/makefile.mk
@@ -123,11 +123,11 @@ ADDITIONAL_FILES= config.h \
 
 BUILD_ACTION=nmake -f makefile.msc
 
-OUT2BIN+=gio$/gio-2.0.dll
-OUT2BIN+=glib$/glib-2.0.dll
-OUT2BIN+=gmodule$/gmodule-2.0.dll
-OUT2BIN+=gobject$/gobject-2.0.dll
-OUT2BIN+=gthread$/gthread-2.0.dll
+OUT2BIN+=gio$/giolo.dll
+OUT2BIN+=glib$/gliblo.dll
+OUT2BIN+=gmodule$/gmodulelo.dll
+OUT2BIN+=gobject$/gobjectlo.dll
+OUT2BIN+=gthread$/gthreadlo.dll
 OUT2BIN+=gobject$/glib-mkenums
 OUT2BIN+=gobject$/glib-genmarshal.exe