changeset 27:4f0b50f2e5d6 trunk

[svn] - fix more build issues
author nenolod
date Mon, 18 Sep 2006 04:12:18 -0700
parents 67b56e61de74
children 8930d68a42c0
files ChangeLog src/amidi-plug/backend-alsa/Makefile src/amidi-plug/backend-dummy/Makefile src/amidi-plug/backend-fluidsynth/Makefile src/amidi-plug/pcfg/Makefile src/paranormal/pn/Makefile
diffstat 6 files changed, 24 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Sep 18 04:09:53 2006 -0700
+++ b/ChangeLog	Mon Sep 18 04:12:18 2006 -0700
@@ -1,3 +1,19 @@
+2006-09-18 11:09:53 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [52]
+  - fix some build errors
+  
+
+  Changes:        Modified:
+  +1 -1           trunk/src/aac/src/Makefile  
+  +1 -1           trunk/src/ladspa/ladspa.c  
+  +1 -1           trunk/src/stereo_plugin/stereo.c  
+  +1 -1           trunk/src/timidity/libtimidity/Makefile  
+  +1 -1           trunk/src/timidity/src/Makefile  
+  +1 -1           trunk/src/voice_removal/voice_removal.c  
+  +1 -1           trunk/src/wma/Makefile  
+  +1 -1           trunk/src/wma/libffwma/Makefile  
+
+
 2006-09-18 11:02:45 +0000  William Pitcock <nenolod@nenolod.net>
   revision [50]
   - fix another AAC build error
--- a/src/amidi-plug/backend-alsa/Makefile	Mon Sep 18 04:09:53 2006 -0700
+++ b/src/amidi-plug/backend-alsa/Makefile	Mon Sep 18 04:12:18 2006 -0700
@@ -3,7 +3,7 @@
 
 noinst_HEADERS = b-alsa.h b-alsa-config.h backend-alsa-icon.xpm
 
-CFLAGS += $(PICFLAGS) $(GLIB_CFLAGS) $(ALSA_CFLAGS) -I../../../../intl -I../../../..
+CFLAGS += $(PICFLAGS) $(GLIB_CFLAGS) $(ALSA_CFLAGS) -I../../..
 
 libdir = $(AMIDIPLUGBACKENDDIR)
 
--- a/src/amidi-plug/backend-dummy/Makefile	Mon Sep 18 04:09:53 2006 -0700
+++ b/src/amidi-plug/backend-dummy/Makefile	Mon Sep 18 04:12:18 2006 -0700
@@ -3,7 +3,7 @@
 
 noinst_HEADERS = b-dummy.h b-dummy-config.h backend-dummy-icon.xpm
 
-CFLAGS += $(PICFLAGS) $(GLIB_CFLAGS) -I../../../../intl -I../../../..
+CFLAGS += $(PICFLAGS) $(GLIB_CFLAGS) -I../../..
 
 libdir = $(AMIDIPLUGBACKENDDIR)
 
--- a/src/amidi-plug/backend-fluidsynth/Makefile	Mon Sep 18 04:09:53 2006 -0700
+++ b/src/amidi-plug/backend-fluidsynth/Makefile	Mon Sep 18 04:12:18 2006 -0700
@@ -3,7 +3,7 @@
 
 noinst_HEADERS = b-fluidsynth.h b-fluidsynth-config.h backend-fluidsynth-icon.xpm
 
-CFLAGS += $(PICFLAGS) $(GLIB_CFLAGS) $(FLUIDSYNTH_CFLAGS) -I../../../../intl -I../../../..
+CFLAGS += $(PICFLAGS) $(GLIB_CFLAGS) $(FLUIDSYNTH_CFLAGS) -I../../..
 
 libdir = $(AMIDIPLUGBACKENDDIR)
 
--- a/src/amidi-plug/pcfg/Makefile	Mon Sep 18 04:09:53 2006 -0700
+++ b/src/amidi-plug/pcfg/Makefile	Mon Sep 18 04:12:18 2006 -0700
@@ -3,7 +3,7 @@
 
 noinst_HEADERS = i_pcfg.h
 
-CFLAGS += $(PICFLAGS) $(GLIB_CFLAGS) -I../../../../intl -I../../../..
+CFLAGS += $(PICFLAGS) $(GLIB_CFLAGS) -I../../..
 
 OBJECTIVE_LIBS_NOINST = libpcfg.a
 
--- a/src/paranormal/pn/Makefile	Mon Sep 18 04:09:53 2006 -0700
+++ b/src/paranormal/pn/Makefile	Mon Sep 18 04:12:18 2006 -0700
@@ -1,12 +1,12 @@
-include ../../../../mk/rules.mk
-include ../../../../mk/init.mk
+include ../../../mk/rules.mk
+include ../../../mk/init.mk
 
 OBJECTIVE_LIBS_NOINST = libparanormal.a
 
 OBJECT_CFLAGS   = $(GTK_CFLAGS)
 OBJECT_LIBS     = $(GTK_LIBS)
 
-CFLAGS += $(PICFLAGS) -Wall -g -I../../../.. $(OBJECT_CFLAGS) $(XML_CPPFLAGS) -I..
+CFLAGS += $(PICFLAGS) -Wall -g -I../../.. $(OBJECT_CFLAGS) $(XML_CPPFLAGS) -I..
 LIBADD   = -lm $(OBJECT_LIBS) $(XML_LIBS)
 
 SOURCES =  \
@@ -43,7 +43,7 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-include ../../../../mk/objective.mk
+include ../../../mk/objective.mk
 
 libparanormal.a: $(OBJECTS)
 	$(AR) cq $@ $(OBJECTS)