changeset 1455:04730ff1693d trunk

[svn] changes link order to avoid linkage with installed library.
author yaz
date Sat, 29 Jul 2006 16:23:16 -0700
parents de0146be48ee
children 6fe7ba6e5489
files ChangeLog audacious/Makefile audtool/Makefile
diffstat 3 files changed, 15 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Jul 28 14:13:59 2006 -0700
+++ b/ChangeLog	Sat Jul 29 16:23:16 2006 -0700
@@ -1,3 +1,12 @@
+2006-07-28 21:13:59 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [1822]
+  - fix the other bug exposed by strace
+  
+
+  Changes:        Modified:
+  +1 -0           trunk/audacious/controlsocket.c  
+
+
 2006-07-28 21:12:59 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1820]
   - fix nemo's bug
--- a/audacious/Makefile	Fri Jul 28 14:13:59 2006 -0700
+++ b/audacious/Makefile	Sat Jul 29 16:23:16 2006 -0700
@@ -9,12 +9,12 @@
 
 LDFLAGS += -Wl,-export-dynamic
 LDADD = \
-	$(GTK_LIBS)      \
-	$(LIBGLADE_LIBS) \
 	-L.. $(LTLIBINTL)     \
 	-L../libaudacious -laudacious \
 	../sqlite/libsqlite.a	\
-	$(CHARDET_LIBS)
+	$(CHARDET_LIBS) \
+	$(GTK_LIBS)      \
+	$(LIBGLADE_LIBS)
 
 CFLAGS += \
 	$(GTK_CFLAGS)      \
--- a/audtool/Makefile	Fri Jul 28 14:13:59 2006 -0700
+++ b/audtool/Makefile	Sat Jul 29 16:23:16 2006 -0700
@@ -7,10 +7,10 @@
 
 LDFLAGS += -Wl,-export-dynamic
 LDADD = \
+	-L.. $(LTLIBINTL)     \
+	-L../libaudacious -laudacious \
 	$(GTK_LIBS)      \
-	$(LIBGLADE_LIBS) \
-	-L.. $(LTLIBINTL)     \
-	-L../libaudacious -laudacious
+	$(LIBGLADE_LIBS)
 
 CFLAGS += \
 	$(GTK_CFLAGS)      \