Mercurial > audlegacy
changeset 615:b2378031a53e trunk
[svn] buildsystem fixes, shouldn't bomb now :P
| author | nenolod |
|---|---|
| date | Sat, 04 Feb 2006 17:29:52 -0800 |
| parents | 2eaaf9c7b6e5 |
| children | efe254078fbc |
| files | Plugins/Input/flac/Makefile.in Plugins/Input/flac/plugin_common/Makefile.in audacious/Makefile.in libaudacious/Makefile.in |
| diffstat | 4 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- 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) \
--- 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) \