changeset 26:67b56e61de74 trunk

[svn] - fix some build errors
author nenolod
date Mon, 18 Sep 2006 04:09:53 -0700
parents dae9233742ae
children 4f0b50f2e5d6
files ChangeLog src/aac/src/Makefile src/ladspa/ladspa.c src/stereo_plugin/stereo.c src/timidity/libtimidity/Makefile src/timidity/src/Makefile src/voice_removal/voice_removal.c src/wma/Makefile src/wma/libffwma/Makefile
diffstat 9 files changed, 17 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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 <nenolod@nenolod.net>
+  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 <nenolod@nenolod.net>
   revision [48]
   - fix AAC build issue
--- 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
--- 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 <audacious/plugin.h>
 #include <audacious/configdb.h>
 
-#include "../../../config.h"
+#include "../../config.h"
 #include "ladspa.h"
 
 #ifndef PATH_MAX
--- 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 <audacious/plugin.h>
 #include <audacious/configdb.h>
 
-#include "../../../config.h"
+#include "../../config.h"
 
 static void init(void);
 static void about(void);
--- 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}
 
--- 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
--- 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 <gtk/gtk.h>
 #include <audacious/plugin.h>
 
-#include "../../../config.h"
+#include "../../config.h"
 
 #define PLUGIN_NAME "voice_removal " PACKAGE_VERSION
 
--- 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
--- 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}