summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2001-06-13 16:57:53 +0000
committerHavoc Pennington <hp@src.gnome.org>2001-06-13 16:57:53 +0000
commit9ba71698c0ab0016f8ba4b2ed78cc480532a5aca (patch)
tree56cc57816031e744892863f2814c4eef799e5163
parent9baa0b6df510725954190904ffd8f2784cf1a841 (diff)
link to ./libgobject-1.3.la since an installed libgobject was somehowGLIB_1_3_6
2001-06-13 Havoc Pennington <hp@redhat.com> * Makefile.am (progs_LDADD): link to ./libgobject-1.3.la since an installed libgobject was somehow being found; think it's a libtool bug, but this workaround should do for now.
-rw-r--r--gobject/ChangeLog6
-rw-r--r--gobject/Makefile.am2
2 files changed, 7 insertions, 1 deletions
diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 2eda694b4..9a107afb0 100644
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-13 Havoc Pennington <hp@redhat.com>
+
+ * Makefile.am (progs_LDADD): link to ./libgobject-1.3.la
+ since an installed libgobject was somehow being found; think
+ it's a libtool bug, but this workaround should do for now.
+
2001-06-12 Havoc Pennington <hp@redhat.com>
* Makefile.am (glib-mkenums): don't put $(srcdir)/glib-mkenums in
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 873eeab44..471b4ab96 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -161,7 +161,7 @@ gobject_query_SOURCES = gobject-query.c
glib_genmarshal_SOURCES = glib-genmarshal.c
testgruntime_SOURCES = testgruntime.c
# link programs against libgobject
-progs_LDADD = libgobject-1.3.la $(libglib)
+progs_LDADD = ./libgobject-1.3.la $(libglib)
glib_genmarshal_LDADD = $(libglib)
gobject_query_LDADD = $(progs_LDADD)
testgruntime_LDADD = $(progs_LDADD)