# HG changeset patch
# User nenolod
# Date 1139102992 28800
# Node ID b2378031a53e0f7264f2e724b57b052d7208cbd8
# Parent  2eaaf9c7b6e58261fafda82b1806f528dc3ffed7
[svn] buildsystem fixes, shouldn't bomb now :P

diff -r 2eaaf9c7b6e5 -r b2378031a53e Plugins/Input/flac/Makefile.in
--- a/Plugins/Input/flac/Makefile.in	Sat Feb 04 17:22:10 2006 -0800
+++ b/Plugins/Input/flac/Makefile.in	Sat Feb 04 17:29:52 2006 -0800
@@ -1,5 +1,5 @@
-include ../../../rules.mk
-include ../../../objective.mk
+include ../../../mk/rules.mk
+include ../../../mk/objective.mk
 
 SUBDIRS = plugin_common
 
diff -r 2eaaf9c7b6e5 -r b2378031a53e Plugins/Input/flac/plugin_common/Makefile.in
--- a/Plugins/Input/flac/plugin_common/Makefile.in	Sat Feb 04 17:22:10 2006 -0800
+++ b/Plugins/Input/flac/plugin_common/Makefile.in	Sat Feb 04 17:29:52 2006 -0800
@@ -1,7 +1,7 @@
-include ../../../../rules.mk
-include ../../../../objective.mk
+include ../../../../mk/rules.mk
+include ../../../../mk/objective.mk
 
-CFLAGS += -fPIC -DPIC -I..
+CFLAGS += -fPIC -DPIC -I.. -I../../../..
 
 OBJECTIVE_LIBS_NOINST = libplugin_common.a
 
diff -r 2eaaf9c7b6e5 -r b2378031a53e audacious/Makefile.in
--- a/audacious/Makefile.in	Sat Feb 04 17:22:10 2006 -0800
+++ b/audacious/Makefile.in	Sat Feb 04 17:29:52 2006 -0800
@@ -12,7 +12,7 @@
 	$(GTK_LIBS)      \
 	$(LIBGLADE_LIBS) \
 	$(LTLIBINTL)     \
-	../libaudacious/libaudacious.a
+	-L../libaudacious -laudacious
 
 CFLAGS += \
 	$(GTK_CFLAGS)      \
diff -r 2eaaf9c7b6e5 -r b2378031a53e libaudacious/Makefile.in
--- a/libaudacious/Makefile.in	Sat Feb 04 17:22:10 2006 -0800
+++ b/libaudacious/Makefile.in	Sat Feb 04 17:29:52 2006 -0800
@@ -6,14 +6,14 @@
 OBJECTIVE_LIBS = libaudacious.so
 OBJECTIVE_LIBS_NOINST = libaudacious.a
 
-LDFLAGS = -Wl,-export-dynamic -Wl,-version-info $(LIBBEEP_MAJOR_VERSION):$(LIBBEEP_MINOR_VERSION):$(LIBBEEP_MICRO_VERSION)
+LDFLAGS = -Wl,-export-dynamic
 
 libaudacious_la_LIBADD = \
 	$(GTK_LIBS)      \
 	$(GCONF_LIBS)    \
 	$(GNOMEVFS_LIBS)
 
-INCLUDES = \
+CFLAGS += -fPIC -DPIC \
 	$(GTK_CFLAGS)        \
 	$(GCONF_CFLAGS)      \
 	$(GNOMEVFS_CFLAGS)   \