Mercurial > audlegacy-plugins
changeset 726:d24c2d0fb60c trunk
[svn] - depend on $(OGG_VORBIS_*) for debian's sake
| author | nenolod |
|---|---|
| date | Sun, 25 Feb 2007 03:35:59 -0800 |
| parents | a467a9e84295 |
| children | b938fe96b20e |
| files | ChangeLog src/flac/Makefile src/flac/libflac/Makefile |
| diffstat | 3 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Feb 24 20:27:03 2007 -0800 +++ b/ChangeLog Sun Feb 25 03:35:59 2007 -0800 @@ -1,3 +1,11 @@ +2007-02-25 04:27:03 +0000 Yoshiki Yazawa <yaz@cc.rim.or.jp> + revision [1536] + - without this, libconsole.so doesn't compile. + + trunk/configure.ac | 1 + + 1 file changed, 1 insertion(+) + + 2007-02-25 01:09:19 +0000 William Pitcock <nenolod@sacredspiral.co.uk> revision [1534] - libflac -> libaudflac to prevent collision in the sun studio linker
--- a/src/flac/Makefile Sat Feb 24 20:27:03 2007 -0800 +++ b/src/flac/Makefile Sun Feb 25 03:35:59 2007 -0800 @@ -17,7 +17,7 @@ LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) -LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) -L./libflac -L./plugin_common -laudflac -logg -lplugin_common +LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) -L./libflac -L./plugin_common -laudflac -lplugin_common $(OGG_VORBIS_LIBS) SOURCES = \ charset.c \ @@ -32,6 +32,7 @@ OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../.. -I./libflac +# XXX: debian +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../.. -I./libflac $(OGG_VORBIS_CFLAGS) include ../../mk/objective.mk
--- a/src/flac/libflac/Makefile Sat Feb 24 20:27:03 2007 -0800 +++ b/src/flac/libflac/Makefile Sun Feb 25 03:35:59 2007 -0800 @@ -28,7 +28,7 @@ OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) -I. -IFLAC +CFLAGS += $(PICFLAGS) -I. -IFLAC $(OGG_VORBIS_CFLAGS) libaudflac.a: ${OBJECTS} ${AR} cq $@ ${OBJECTS}