# HG changeset patch # User nenolod # Date 1158577793 25200 # Node ID 67b56e61de74d5c007c3a720fc8420f72d2f4e94 # Parent dae9233742aeadc28dd6f7f77a4020daba5d8348 [svn] - fix some build errors diff -r dae9233742ae -r 67b56e61de74 ChangeLog --- a/ChangeLog Mon Sep 18 04:02:45 2006 -0700 +++ b/ChangeLog Mon Sep 18 04:09:53 2006 -0700 @@ -1,3 +1,12 @@ +2006-09-18 11:02:45 +0000 William Pitcock + revision [50] + - fix another AAC build error + + + Changes: Modified: + +1 -1 trunk/src/aac/libfaad2/Makefile + + 2006-09-18 11:02:01 +0000 William Pitcock revision [48] - fix AAC build issue diff -r dae9233742ae -r 67b56e61de74 src/aac/src/Makefile --- a/src/aac/src/Makefile Mon Sep 18 04:02:45 2006 -0700 +++ b/src/aac/src/Makefile Mon Sep 18 04:09:53 2006 -0700 @@ -14,6 +14,6 @@ OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(GTK_CFLAGS) -I../../../../intl -I../../../.. -I../include -I../libfaad -I../mp4ff +CFLAGS += $(GTK_CFLAGS) -I../../.. -I../include -I../libfaad -I../mp4ff include ../../../mk/objective.mk diff -r dae9233742ae -r 67b56e61de74 src/ladspa/ladspa.c --- a/src/ladspa/ladspa.c Mon Sep 18 04:02:45 2006 -0700 +++ b/src/ladspa/ladspa.c Mon Sep 18 04:09:53 2006 -0700 @@ -30,7 +30,7 @@ #include #include -#include "../../../config.h" +#include "../../config.h" #include "ladspa.h" #ifndef PATH_MAX diff -r dae9233742ae -r 67b56e61de74 src/stereo_plugin/stereo.c --- a/src/stereo_plugin/stereo.c Mon Sep 18 04:02:45 2006 -0700 +++ b/src/stereo_plugin/stereo.c Mon Sep 18 04:09:53 2006 -0700 @@ -5,7 +5,7 @@ #include #include -#include "../../../config.h" +#include "../../config.h" static void init(void); static void about(void); diff -r dae9233742ae -r 67b56e61de74 src/timidity/libtimidity/Makefile --- a/src/timidity/libtimidity/Makefile Mon Sep 18 04:02:45 2006 -0700 +++ b/src/timidity/libtimidity/Makefile Mon Sep 18 04:09:53 2006 -0700 @@ -17,7 +17,7 @@ tables.c \ timidity.c -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../../intl -I../../../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../.. OBJECTS = ${SOURCES:.c=.o} diff -r dae9233742ae -r 67b56e61de74 src/timidity/src/Makefile --- a/src/timidity/src/Makefile Mon Sep 18 04:02:45 2006 -0700 +++ b/src/timidity/src/Makefile Mon Sep 18 04:09:53 2006 -0700 @@ -14,6 +14,6 @@ OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../../../intl -I../../../.. -I../libtimidity +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../.. -I../libtimidity include ../../../mk/objective.mk diff -r dae9233742ae -r 67b56e61de74 src/voice_removal/voice_removal.c --- a/src/voice_removal/voice_removal.c Mon Sep 18 04:02:45 2006 -0700 +++ b/src/voice_removal/voice_removal.c Mon Sep 18 04:09:53 2006 -0700 @@ -24,7 +24,7 @@ #include #include -#include "../../../config.h" +#include "../../config.h" #define PLUGIN_NAME "voice_removal " PACKAGE_VERSION diff -r dae9233742ae -r 67b56e61de74 src/wma/Makefile --- a/src/wma/Makefile Mon Sep 18 04:02:45 2006 -0700 +++ b/src/wma/Makefile Mon Sep 18 04:09:53 2006 -0700 @@ -13,6 +13,6 @@ OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../../intl -I../.. -I./libffwma -std=c99 +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) -I../.. -I./libffwma -std=c99 include ../../mk/objective.mk diff -r dae9233742ae -r 67b56e61de74 src/wma/libffwma/Makefile --- a/src/wma/libffwma/Makefile Mon Sep 18 04:02:45 2006 -0700 +++ b/src/wma/libffwma/Makefile Mon Sep 18 04:09:53 2006 -0700 @@ -13,7 +13,7 @@ parser.c simple_idct.c simple_idct.h \ utils.h utils.c wmadata.h wmadec.c mem.c uri.c -CFLAGS+= $(PICFLAGS) $(GTK_CFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -c -I../../../.. -I../../../../intl +CFLAGS+= $(PICFLAGS) $(GTK_CFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -c -I../../.. OBJECTS=${SOURCES:.c=.o}