[patch] glib-1.2.10-as-needed.patch

glib-1.2.10-as-needed.patch (text/plain), 3.37 KB, created by Thomas S. Howard on 2006-05-19 15:55:55 UTC

--- glib-1.2.10/gmodule/Makefile.am.orig	2001-03-15 07:33:10.000000000 -0800
+++ glib-1.2.10/gmodule/Makefile.am		2006-05-18 21:01:56.000000000 -0700
@@ -29,17 +29,15 @@
 	-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 ;(
+libgmodule_la_LIBADD = @G_MODULE_LIBS@ $(libglib)
 
 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_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)
+libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ $(libglib)
 
 noinst_PROGRAMS = testgmodule
 testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
--- glib-1.2.10/gmodule/Makefile.in.orig	2001-03-15 07:48:51.000000000 -0800
+++ glib-1.2.10/gmodule/Makefile.in		2006-05-18 23:00:41.000000000 -0700
@@ -104,7 +104,7 @@
 glibinclude_HEADERS =  		gmodule.h
 
 
-libglib = $(top_builddir)/libglib.la # -lglib
+libglib = $(top_builddir)/libglib.la 
 
 lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la
 
@@ -112,17 +112,15 @@
 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 ;(
+libgmodule_la_LIBADD = @G_MODULE_LIBS@  $(libglib)
 
 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_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)
+libgplugin_b_la_LIBADD = @G_MODULE_LIBS@  $(libglib)
 
 noinst_PROGRAMS = testgmodule
 testgmodule_LDFLAGS =  @G_MODULE_LDFLAGS@
@@ -139,9 +137,9 @@
 LIBS = @LIBS@
 libgmodule_la_DEPENDENCIES = 
 libgmodule_la_OBJECTS =  gmodule.lo
-libgplugin_a_la_DEPENDENCIES = 
+libgplugin_a_la_DEPENDENCIES = libgmodule.la
 libgplugin_a_la_OBJECTS =  libgplugin_a.lo
-libgplugin_b_la_DEPENDENCIES = 
+libgplugin_b_la_DEPENDENCIES = libgmodule.la
 libgplugin_b_la_OBJECTS =  libgplugin_b.lo
 PROGRAMS =  $(noinst_PROGRAMS)
 
--- glib-1.2.10/gthread/Makefile.am.orig	1999-08-26 06:09:43.000000000 -0700
+++ glib-1.2.10/gthread/Makefile.am		2006-05-18 21:16:17.000000000 -0700
@@ -19,7 +19,7 @@
 	-release $(LT_RELEASE) \
 	-export-dynamic
 
-libgthread_la_LIBADD = @G_THREAD_LIBS@
+libgthread_la_LIBADD = @G_THREAD_LIBS@ $(libglib)
 
 noinst_PROGRAMS = testgthread
 testgthread_LDADD = ../libglib.la libgthread.la 
--- glib-1.2.10/gthread/Makefile.in.orig	2001-03-15 07:48:51.000000000 -0800
+++ glib-1.2.10/gthread/Makefile.in		2006-05-18 21:16:30.000000000 -0700
@@ -105,7 +105,7 @@
 libgthread_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE) 	-export-dynamic
 
 
-libgthread_la_LIBADD = @G_THREAD_LIBS@
+libgthread_la_LIBADD = @G_THREAD_LIBS@ $(libglib)
 
 noinst_PROGRAMS = testgthread
 testgthread_LDADD = ../libglib.la libgthread.la