# HG changeset patch # User nenolod # Date 1158576897 25200 # Node ID 21320918cc08590bc0a504e6c16fe71f78151933 # Parent eab0c42413489bd9126b45bb91d9b69f3bb9e510 [svn] - missed a few spots diff -r eab0c4241348 -r 21320918cc08 ChangeLog --- a/ChangeLog Mon Sep 18 03:53:06 2006 -0700 +++ b/ChangeLog Mon Sep 18 03:54:57 2006 -0700 @@ -1,3 +1,24 @@ +2006-09-18 10:53:06 +0000 William Pitcock + revision [44] + - finish up on the Makefile reduction + + + Changes: Modified: + +0 -6 trunk/configure.ac + +15 -0 trunk/src/arts/arts_helper/Makefile + +0 -15 trunk/src/arts/arts_helper/Makefile.in + +26 -0 trunk/src/flac/plugin_common/Makefile + +0 -26 trunk/src/flac/plugin_common/Makefile.in + +18 -0 trunk/src/modplug/archive/Makefile + +0 -18 trunk/src/modplug/archive/Makefile.in + +12 -0 trunk/src/modplug/gui/Makefile + +0 -12 trunk/src/modplug/gui/Makefile.in + +27 -0 trunk/src/timidity/libtimidity/Makefile + +0 -27 trunk/src/timidity/libtimidity/Makefile.in + +19 -0 trunk/src/timidity/src/Makefile + +0 -19 trunk/src/timidity/src/Makefile.in + + 2006-09-18 10:49:03 +0000 William Pitcock revision [42] - update configure.ac diff -r eab0c4241348 -r 21320918cc08 src/aac/libfaad2/Makefile --- a/src/aac/libfaad2/Makefile Mon Sep 18 03:53:06 2006 -0700 +++ b/src/aac/libfaad2/Makefile Mon Sep 18 03:54:57 2006 -0700 @@ -1,5 +1,5 @@ -include ../../../../mk/rules.mk -include ../../../../mk/init.mk +include ../../../mk/rules.mk +include ../../../mk/init.mk CFLAGS += -I../include -I../../../.. -I. $(PICFLAGS) @@ -18,7 +18,7 @@ OBJECTS = ${SOURCES:.c=.o} -include ../../../../mk/objective.mk +include ../../../mk/objective.mk libfaad.a: $(OBJECTS) $(AR) cq $@ $(OBJECTS) diff -r eab0c4241348 -r 21320918cc08 src/aac/mp4ff/Makefile --- a/src/aac/mp4ff/Makefile Mon Sep 18 03:53:06 2006 -0700 +++ b/src/aac/mp4ff/Makefile Mon Sep 18 03:54:57 2006 -0700 @@ -1,5 +1,5 @@ -include ../../../../mk/rules.mk -include ../../../../mk/init.mk +include ../../../mk/rules.mk +include ../../../mk/init.mk OBJECTIVE_LIBS_NOINST = libmp4ff.a @@ -10,7 +10,7 @@ CFLAGS += $(PICFLAGS) -DUSE_TAGGING=1 -fsigned-char -I../../../.. -I../../../../intl -include ../../../../mk/objective.mk +include ../../../mk/objective.mk libmp4ff.a: $(OBJECTS) $(AR) cq $@ $(OBJECTS) diff -r eab0c4241348 -r 21320918cc08 src/aac/src/Makefile --- a/src/aac/src/Makefile Mon Sep 18 03:53:06 2006 -0700 +++ b/src/aac/src/Makefile Mon Sep 18 03:54:57 2006 -0700 @@ -1,5 +1,5 @@ -include ../../../../mk/rules.mk -include ../../../../mk/init.mk +include ../../../mk/rules.mk +include ../../../mk/init.mk OBJECTIVE_LIBS = libaac$(SHARED_SUFFIX) @@ -16,4 +16,4 @@ CFLAGS += $(GTK_CFLAGS) -I../../../../intl -I../../../.. -I../include -I../libfaad -I../mp4ff -include ../../../../mk/objective.mk +include ../../../mk/objective.mk diff -r eab0c4241348 -r 21320918cc08 src/wma/libffwma/Makefile --- a/src/wma/libffwma/Makefile Mon Sep 18 03:53:06 2006 -0700 +++ b/src/wma/libffwma/Makefile Mon Sep 18 03:54:57 2006 -0700 @@ -1,5 +1,5 @@ -include ../../../../mk/rules.mk -include ../../../../mk/init.mk +include ../../../mk/rules.mk +include ../../../mk/init.mk OBJECTIVE_LIBS_NOINST= libffwma.a @@ -17,7 +17,7 @@ OBJECTS=${SOURCES:.c=.o} -include ../../../../mk/objective.mk +include ../../../mk/objective.mk libffwma.a: $(OBJECTS) $(AR) cq $@ $(OBJECTS)