luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-30 13:53:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Set G_LOG_DOMAIN to \"GModule\" instead of g_log_domain_gmodule.

Browse Source 
2001-03-07  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* makefile.cygwin.in, makefile.msc.in: Set G_LOG_DOMAIN to
	\"GModule\" instead of g_log_domain_gmodule.

	* gmodule/Makefile.am: Set G_LOG_DOMAIN to \"GModule\" instead of
	g_log_domain_gmodule.

	* gmodule/gmodule.c, gmodule/gmodule.def, gmodule/gmodule.h: Removed
	g_log_domain_gmodule. This fixes Bug #51643 for good.
This commit is contained in:
Sebastian Wilhelmi
2001-03-07 13:06:06 +00:00
committed by Sebastian Wilhelmi
parent 69e7f0db6e
commit 333f624e9f
16 changed files with 217 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2001-03-07 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* makefile.cygwin.in, makefile.msc.in: Set G_LOG_DOMAIN to
\"GModule\" instead of g_log_domain_gmodule. This fixes Bug
#51643 for good.
Fri Mar 2 12:35:40 2001 Owen Taylor <otaylor@redhat.com>
* Release 1.2.9

6
ChangeLog.pre-2-0
View File

@@ -1,3 +1,9 @@
2001-03-07 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* makefile.cygwin.in, makefile.msc.in: Set G_LOG_DOMAIN to
\"GModule\" instead of g_log_domain_gmodule. This fixes Bug
#51643 for good.
Fri Mar 2 12:35:40 2001 Owen Taylor <otaylor@redhat.com>
* Release 1.2.9

6
ChangeLog.pre-2-10
View File

@@ -1,3 +1,9 @@
2001-03-07 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* makefile.cygwin.in, makefile.msc.in: Set G_LOG_DOMAIN to
\"GModule\" instead of g_log_domain_gmodule. This fixes Bug
#51643 for good.
Fri Mar 2 12:35:40 2001 Owen Taylor <otaylor@redhat.com>
* Release 1.2.9

6
ChangeLog.pre-2-12
View File

@@ -1,3 +1,9 @@
2001-03-07 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* makefile.cygwin.in, makefile.msc.in: Set G_LOG_DOMAIN to
\"GModule\" instead of g_log_domain_gmodule. This fixes Bug
#51643 for good.
Fri Mar 2 12:35:40 2001 Owen Taylor <otaylor@redhat.com>
* Release 1.2.9

6
ChangeLog.pre-2-2
View File

@@ -1,3 +1,9 @@
2001-03-07 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* makefile.cygwin.in, makefile.msc.in: Set G_LOG_DOMAIN to
\"GModule\" instead of g_log_domain_gmodule. This fixes Bug
#51643 for good.
Fri Mar 2 12:35:40 2001 Owen Taylor <otaylor@redhat.com>
* Release 1.2.9

6
ChangeLog.pre-2-4
View File

@@ -1,3 +1,9 @@
2001-03-07 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* makefile.cygwin.in, makefile.msc.in: Set G_LOG_DOMAIN to
\"GModule\" instead of g_log_domain_gmodule. This fixes Bug
#51643 for good.
Fri Mar 2 12:35:40 2001 Owen Taylor <otaylor@redhat.com>
* Release 1.2.9

6
ChangeLog.pre-2-6
View File

@@ -1,3 +1,9 @@
2001-03-07 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* makefile.cygwin.in, makefile.msc.in: Set G_LOG_DOMAIN to
\"GModule\" instead of g_log_domain_gmodule. This fixes Bug
#51643 for good.
Fri Mar 2 12:35:40 2001 Owen Taylor <otaylor@redhat.com>
* Release 1.2.9

6
ChangeLog.pre-2-8
View File

@@ -1,3 +1,9 @@
2001-03-07 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* makefile.cygwin.in, makefile.msc.in: Set G_LOG_DOMAIN to
\"GModule\" instead of g_log_domain_gmodule. This fixes Bug
#51643 for good.
Fri Mar 2 12:35:40 2001 Owen Taylor <otaylor@redhat.com>
* Release 1.2.9

2
glib/makefile.msc.in
View File

@@ -91,7 +91,7 @@ gmodule-$(GLIB_VER).dll : $(gmodule_OBJECTS)
$(CC) $(CFLAGS) -LD -Fegmodule-$(GLIB_VER).dll $(gmodule_OBJECTS) glib-$(GLIB_VER).lib $(LDFLAGS) /def:gmodule\gmodule.def
gmodule.obj : gmodule\gmodule.c gmodule\gmodule-win32.c
$(CC) $(CFLAGS) -GD -Igmodule -c -DG_LOG_DOMAIN=g_log_domain_gmodule gmodule\gmodule.c
$(CC) $(CFLAGS) -GD -Igmodule -c -DG_LOG_DOMAIN=\"GModule\" gmodule\gmodule.c
gmodule\gmoduleconf.h: gmodule\gmoduleconf.h.win32
copy gmodule\gmoduleconf.h.win32 gmodule\gmoduleconf.h

8
gmodule/ChangeLog
View File

@@ -1,3 +1,11 @@
2001-03-07 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* Makefile.am: Set G_LOG_DOMAIN to \"GModule\" instead of
g_log_domain_gmodule.
* gmodule.c, gmodule.def, gmodule.h: Removed
g_log_domain_gmodule. This fixes Bug #51643 for good.
Sat Feb 17 07:33:21 2001 Tim Janik <timj@gtk.org>
* gmodule-dl.c: fix systems with broken RTLD_GLOBAL.

2
gmodule/Makefile.am
View File

@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gmodule \
-DG_LOG_DOMAIN=g_log_domain_gmodule @GLIB_DEBUG_FLAGS@
-DG_LOG_DOMAIN=\"GModule\" @GLIB_DEBUG_FLAGS@
EXTRA_DIST = \
gmoduleconf.h.in \

1
gmodule/gmodule.c
View File

@@ -72,7 +72,6 @@ static inline GModule* g_module_find_by_name (const gchar *name);
/* --- variables --- */
G_LOCK_DEFINE_STATIC (GModule);
const char *g_log_domain_gmodule = "GModule";
static GModule *modules = NULL;
static GModule *main_module = NULL;
static GStaticPrivate module_error_private = G_STATIC_PRIVATE_INIT;

1
gmodule/gmodule.def
View File

@@ -1,5 +1,4 @@
EXPORTS
g_log_domain_gmodule
g_module_build_path
g_module_close
g_module_error

3
gmodule/gmodule.h
View File

@@ -33,9 +33,6 @@
extern "C" {
#endif /* __cplusplus */
extern const char *g_log_domain_gmodule;
/* exporting and importing functions, this is special cased
* to feature Windows dll stubs.
*/

158
makefile.cygwin.in Normal file
View File

@@ -0,0 +1,158 @@
## Makefile for building the GLib, gmodule and gthread DLLs with
## egcs on cygwin.
## Use: make -f makefile.cygwin install
# Change this to wherever you want to install the DLLs. This directory
# should be in your PATH.
BIN = /bin
# This is the location of pthreads for Win32,
# see http://sourceware.cygnus.com/pthreads-win32/
# We want the 1999-05-30 snapshot.
PTHREADS = ../pthreads-snap-1999-05-30
PTHREAD_LIB = -L$(PTHREADS) -lpthread32
PTHREAD_INC = -I $(PTHREADS)
OPTIMIZE = -g -O
################################################################
# Nothing much configurable below
CC = gcc -mno-cygwin -mpentium
CP = cp
LD = ld
DLLTOOL = dlltool
INSTALL = install
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
CFLAGS = $(OPTIMIZE) -I. -DHAVE_CONFIG_H
all : \
config.h \
glibconfig.h \
glib-$(GLIB_VER).gcc.dll \
gmodule/gmoduleconf.h \
gmodule-$(GLIB_VER).gcc.dll \
gthread-$(GLIB_VER).gcc.dll \
testglib.exe \
testgmodule.exe \
testgdate.exe \
testgdateparser.exe
install : all
$(INSTALL) glib-$(GLIB_VER).gcc.dll $(BIN)
$(INSTALL) gmodule-$(GLIB_VER).gcc.dll $(BIN)
$(INSTALL) gthread-$(GLIB_VER).gcc.dll $(BIN)
glib_OBJECTS = \
garray.o \
gcache.o \
gcompletion.o \
gdataset.o \
gdate.o \
gerror.o \
ghook.o \
ghash.o \
giochannel.o \
giowin32.o \
glist.o \
gmain.o \
gmem.o \
gmessages.o \
gnode.o \
gprimes.o \
gqueue.o \
grand.o \
gslist.o \
gstack.o \
gthread.o \
gtimer.o \
gtree.o \
grel.o \
gstring.o \
gstrfuncs.o \
gscanner.o \
gutils.o
glib-$(GLIB_VER).gcc.dll : $(glib_OBJECTS) glib.def
./build-dll glib $(GLIB_VER).gcc glib.def $(glib_OBJECTS) -luser32 -lwsock32
glibconfig.h: glibconfig.h.win32
$(CP) glibconfig.h.win32 glibconfig.h
config.h: config.h.win32
$(CP) config.h.win32 config.h
.c.o :
$(CC) $(CFLAGS) -c -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib $<
gmodule_OBJECTS = \
gmodule.o
gmodule-$(GLIB_VER).gcc.dll : $(gmodule_OBJECTS) gmodule/gmodule.def
./build-dll gmodule $(GLIB_VER).gcc gmodule/gmodule.def $(gmodule_OBJECTS) -L. -lglib-$(GLIB_VER).gcc -lwsock32
gmodule.o : gmodule/gmodule.c gmodule/gmodule-win32.c
$(CC) $(CFLAGS) -Igmodule -c -DG_LOG_DOMAIN=\"GModule\" gmodule/gmodule.c
gmodule/gmoduleconf.h: gmodule/gmoduleconf.h.win32
$(CP) gmodule/gmoduleconf.h.win32 gmodule/gmoduleconf.h
gthread_OBJECTS = \
gthread-impl.o
gthread-$(GLIB_VER).gcc.dll : $(gthread_OBJECTS) glib-$(GLIB_VER).gcc.dll gthread/gthread.def
./build-dll gthread $(GLIB_VER).gcc gthread/gthread.def $(gthread_OBJECTS) -L. -lglib-$(GLIB_VER).gcc $(PTHREAD_LIB)
gthread-impl.o : gthread/gthread-impl.c gthread/gthread-posix.c
$(CC) $(CFLAGS) $(PTHREAD_INC) -DG_LOG_DOMAIN=\"GThread\" -c gthread/gthread-impl.c
testglib.exe : glib-$(GLIB_VER).gcc.dll testglib.o
$(CC) $(CFLAGS) -o testglib testglib.o -L. -lglib-$(GLIB_VER).gcc $(LDFLAGS)
testglib.o : testglib.c
$(CC) -c $(CFLAGS) testglib.c
testgdate.exe : glib-$(GLIB_VER).gcc.dll testgdate.o
$(CC) $(CFLAGS) -o testgdate.exe testgdate.o -L. -lglib-$(GLIB_VER).gcc $(LDFLAGS)
testgdate.o : testgdate.c
$(CC) -c $(CFLAGS) testgdate.c
testgdateparser.exe : glib-$(GLIB_VER).gcc.dll testgdateparser.o
$(CC) $(CFLAGS) -o testgdateparser.exe testgdateparser.o -L. -lglib-$(GLIB_VER).gcc $(LDFLAGS)
testgdateparser.o : testgdateparser.c
$(CC) -c $(CFLAGS) testgdateparser.c
testgmodule.exe : glib-$(GLIB_VER).gcc.dll gmodule-$(GLIB_VER).gcc.dll testgmodule.o libgplugin_a.dll libgplugin_b.dll
# Wow, do we really have to do it like this to get some symbols
# exported from a .exe? Apparently yes. Does the __declspec(dllexport)
# actually do anything in egcs-1.1.2?
$(CC) $(CFLAGS) -Wl,--base-file,testgmodule.base -o testgmodule.exe testgmodule.o -L. -lglib-$(GLIB_VER).gcc -lgmodule-$(GLIB_VER).gcc $(LDFLAGS)
$(DLLTOOL) --base-file testgmodule.base --output-exp testgmodule.exp testgmodule.o
$(CC) $(CFLAGS) -Wl,--base-file,testgmodule.base,testgmodule.exp -o testgmodule.exe testgmodule.o -L. -lglib-$(GLIB_VER).gcc -lgmodule-$(GLIB_VER).gcc $(LDFLAGS)
$(DLLTOOL) --base-file testgmodule.base --output-exp testgmodule.exp testgmodule.o
$(CC) $(CFLAGS) -Wl,testgmodule.exp -o testgmodule.exe testgmodule.o -L. -lglib-$(GLIB_VER).gcc -lgmodule-$(GLIB_VER).gcc $(LDFLAGS)
testgmodule.o : gmodule/testgmodule.c
$(CC) $(CFLAGS) -Igmodule -c gmodule/testgmodule.c
libgplugin_a.dll : libgplugin_a.o
./build-dll libgplugin_a - - libgplugin_a.o -L. -lglib-$(GLIB_VER).gcc -lgmodule-$(GLIB_VER).gcc
libgplugin_a.o : gmodule/libgplugin_a.c
$(CC) $(CFLAGS) -Igmodule -c gmodule/libgplugin_a.c
libgplugin_b.dll : libgplugin_b.o
./build-dll libgplugin_b - - libgplugin_b.o -L. -lglib-$(GLIB_VER).gcc -lgmodule-$(GLIB_VER).gcc
libgplugin_b.o : gmodule/libgplugin_b.c
$(CC) $(CFLAGS) -Igmodule -c gmodule/libgplugin_b.c
clean:
-rm config.h glibconfig.h gmodule/gmoduleconf.h
-rm *.exe *.o *.dll *.a *.base *.exp

2
makefile.msc.in
View File

@@ -91,7 +91,7 @@ gmodule-$(GLIB_VER).dll : $(gmodule_OBJECTS)
$(CC) $(CFLAGS) -LD -Fegmodule-$(GLIB_VER).dll $(gmodule_OBJECTS) glib-$(GLIB_VER).lib $(LDFLAGS) /def:gmodule\gmodule.def
gmodule.obj : gmodule\gmodule.c gmodule\gmodule-win32.c
$(CC) $(CFLAGS) -GD -Igmodule -c -DG_LOG_DOMAIN=g_log_domain_gmodule gmodule\gmodule.c
$(CC) $(CFLAGS) -GD -Igmodule -c -DG_LOG_DOMAIN=\"GModule\" gmodule\gmodule.c
gmodule\gmoduleconf.h: gmodule\gmoduleconf.h.win32
copy gmodule\gmoduleconf.h.win32 gmodule\gmoduleconf.h