Attachment #87074 for bug #133818




	-release $(LT_RELEASE) \
	-export-dynamic

libgmodule_la_LIBADD = @G_MODULE_LIBS@ $(libglib)
# we should really depend on $(libglib) for libgmodule.la, but libtool has a
# problem with this ;(

libgplugin_a_la_SOURCES = libgplugin_a.c
libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module
libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ $(libglib)

libgplugin_b_la_SOURCES = libgplugin_b.c
libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module
libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ $(libglib)

noinst_PROGRAMS = testgmodule
testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@




glibinclude_HEADERS =  		gmodule.h


libglib = $(top_builddir)/libglib.la 

lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la


libgmodule_la_LDFLAGS =  	@G_MODULE_LDFLAGS@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE) 	-export-dynamic


libgmodule_la_LIBADD = @G_MODULE_LIBS@  $(libglib)
# we should really depend on $(libglib) for libgmodule.la, but libtool has a
# problem with this ;(

libgplugin_a_la_SOURCES = libgplugin_a.c
libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module
libgplugin_a_la_LIBADD = @G_MODULE_LIBS@  $(libglib) libgmodule.la

libgplugin_b_la_SOURCES = libgplugin_b.c
libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module
libgplugin_b_la_LIBADD = @G_MODULE_LIBS@  $(libglib)

noinst_PROGRAMS = testgmodule
testgmodule_LDFLAGS =  @G_MODULE_LDFLAGS@

LIBS = @LIBS@
libgmodule_la_DEPENDENCIES = 
libgmodule_la_OBJECTS =  gmodule.lo
libgplugin_a_la_DEPENDENCIES = libgmodule.la
libgplugin_a_la_OBJECTS =  libgplugin_a.lo
libgplugin_b_la_DEPENDENCIES = libgmodule.la
libgplugin_b_la_OBJECTS =  libgplugin_b.lo
PROGRAMS =  $(noinst_PROGRAMS)


Lines 19-25 Link Here

(-)glib-1.2.10/gthread/Makefile.am.orig (-1 / +1 lines)
19	-release $(LT_RELEASE) \	19	-release $(LT_RELEASE) \
20	-export-dynamic	20	-export-dynamic
21		21
22	libgthread_la_LIBADD = @G_THREAD_LIBS@	22	libgthread_la_LIBADD = @G_THREAD_LIBS@ $(libglib)
23		23
24	noinst_PROGRAMS = testgthread	24	noinst_PROGRAMS = testgthread
25	testgthread_LDADD = ../libglib.la libgthread.la	25	testgthread_LDADD = ../libglib.la libgthread.la

Lines 105-111 Link Here

(-)glib-1.2.10/gthread/Makefile.in.orig (-1 / +1 lines)
105	libgthread_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic	105	libgthread_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic
106		106
107		107
108	libgthread_la_LIBADD = @G_THREAD_LIBS@	108	libgthread_la_LIBADD = @G_THREAD_LIBS@ $(libglib)
109		109
110	noinst_PROGRAMS = testgthread	110	noinst_PROGRAMS = testgthread
111	testgthread_LDADD = ../libglib.la libgthread.la	111	testgthread_LDADD = ../libglib.la libgthread.la

Return to bug 133818

Lines 29-45 Link Here

(-)glib-1.2.10/gmodule/Makefile.am.orig (-5 / +3 lines)
29	-release $(LT_RELEASE) \	29	-release $(LT_RELEASE) \
30	-export-dynamic	30	-export-dynamic
31		31
32	libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)	32	libgmodule_la_LIBADD = @G_MODULE_LIBS@ $(libglib)
33	# we should really depend on $(libglib) for libgmodule.la, but libtool has a
34	# problem with this ;(
35		33
36	libgplugin_a_la_SOURCES = libgplugin_a.c	34	libgplugin_a_la_SOURCES = libgplugin_a.c
37	libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module	35	libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module
38	libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)	36	libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ $(libglib)
39		37
40	libgplugin_b_la_SOURCES = libgplugin_b.c	38	libgplugin_b_la_SOURCES = libgplugin_b.c
41	libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module	39	libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module
42	libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)	40	libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ $(libglib)
43		41
44	noinst_PROGRAMS = testgmodule	42	noinst_PROGRAMS = testgmodule
45	testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@	43	testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@

Lines 104-110 Link Here

(-)glib-1.2.10/gmodule/Makefile.in.orig (-8 / +6 lines)
104	glibinclude_HEADERS = gmodule.h	104	glibinclude_HEADERS = gmodule.h
105		105
106		106
107	libglib = $(top_builddir)/libglib.la # -lglib	107	libglib = $(top_builddir)/libglib.la
108		108
109	lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la	109	lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la
110		110
Lines 112-128 Link Here
112	libgmodule_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic	112	libgmodule_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic
113		113
114		114
115	libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)	115	libgmodule_la_LIBADD = @G_MODULE_LIBS@ $(libglib)
116	# we should really depend on $(libglib) for libgmodule.la, but libtool has a
117	# problem with this ;(
118		116
119	libgplugin_a_la_SOURCES = libgplugin_a.c	117	libgplugin_a_la_SOURCES = libgplugin_a.c
120	libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module	118	libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module
121	libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)	119	libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ $(libglib) libgmodule.la
122		120
123	libgplugin_b_la_SOURCES = libgplugin_b.c	121	libgplugin_b_la_SOURCES = libgplugin_b.c
124	libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module	122	libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module
125	libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)	123	libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ $(libglib)
126		124
127	noinst_PROGRAMS = testgmodule	125	noinst_PROGRAMS = testgmodule
128	testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@	126	testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@
Lines 139-147 Link Here
139	LIBS = @LIBS@	137	LIBS = @LIBS@
140	libgmodule_la_DEPENDENCIES =	138	libgmodule_la_DEPENDENCIES =
141	libgmodule_la_OBJECTS = gmodule.lo	139	libgmodule_la_OBJECTS = gmodule.lo
142	libgplugin_a_la_DEPENDENCIES =	140	libgplugin_a_la_DEPENDENCIES = libgmodule.la
143	libgplugin_a_la_OBJECTS = libgplugin_a.lo	141	libgplugin_a_la_OBJECTS = libgplugin_a.lo
144	libgplugin_b_la_DEPENDENCIES =	142	libgplugin_b_la_DEPENDENCIES = libgmodule.la
145	libgplugin_b_la_OBJECTS = libgplugin_b.lo	143	libgplugin_b_la_OBJECTS = libgplugin_b.lo
146	PROGRAMS = $(noinst_PROGRAMS)	144	PROGRAMS = $(noinst_PROGRAMS)
147		145