Mercurial > audlegacy-plugins

changeset 894:f19e6748d8eb trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] maintenance of build system: - link for OBJECTIVE_LIBS had not occurred even if OBJECTIVE_LIBS_NOINST was re-linked. LIBDEP macro is introduced to indicate dependency. - make rules such as $(AR) cq $@ $(OBJECTS) in individual Makefile have been removed. these linkage will be done through objective.mk. - *.h has been removed from SOURCES. these files had been passed to linker as object files.
author yaz
date Sat, 24 Mar 2007 09:08:58 -0700
parents ca9907354db6
children 5d7e6f06c9b7
files ChangeLog mk/objective.mk src/aac/libfaad2/Makefile src/aac/mp4ff/Makefile src/aac/src/Makefile src/adplug/Makefile src/amidi-plug/Makefile src/amidi-plug/backend-alsa/Makefile src/amidi-plug/backend-dummy/Makefile src/amidi-plug/backend-fluidsynth/Makefile src/flac/Makefile src/flac/libflac/Makefile src/flac/plugin_common/Makefile src/modplug/Makefile src/modplug/archive/Makefile src/modplug/gui/Makefile src/paranormal/Makefile src/paranormal/libcalc/Makefile src/rovascope/Makefile src/rovascope/libcalc/Makefile src/timidity/libtimidity/Makefile src/timidity/src/Makefile src/wma/Makefile src/wma/libffwma/Makefile
diffstat 24 files changed, 42 insertions(+), 40 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Mar 23 06:46:04 2007 -0700
+++ b/ChangeLog	Sat Mar 24 09:08:58 2007 -0700
@@ -1,3 +1,13 @@
+2007-03-23 13:46:04 +0000  Giacomo Lozito <james@develia.org>
+  revision [1886]
+  - aosd: added an option to enable/disable utf8 text conversion done by the plugin
+  trunk/src/aosd/aosd_cfg.c     |   19 +++++++++++++++++--
+  trunk/src/aosd/aosd_cfg.h     |    3 ++-
+  trunk/src/aosd/aosd_trigger.c |   16 ++++++++++++++--
+  trunk/src/aosd/aosd_ui.c      |   26 +++++++++++++++++++++++++-
+  4 files changed, 58 insertions(+), 6 deletions(-)
+
+
 2007-03-23 05:19:41 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [1884]
   - initial support for writing relative path.
--- a/mk/objective.mk	Fri Mar 23 06:46:04 2007 -0700
+++ b/mk/objective.mk	Sat Mar 24 09:08:58 2007 -0700
@@ -208,7 +208,7 @@
 	fi;
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
-$(OBJECTIVE_LIBS): $(OBJECTS)
+$(OBJECTIVE_LIBS): $(OBJECTS) $(LIBDEP)
 	if [ "x$(OBJECTS)" != "x" ]; then \
 		$(MAKE) $(OBJECTS) || exit;		\
 		printf "%10s     %-20s\n" LINK $@; \
@@ -223,14 +223,14 @@
 		 fi;) \
 	fi
 
-%.a: $(OBJECTS)
+$(OBJECTIVE_LIBS_NOINST): $(OBJECTS)
 	if [ "x$(OBJECTS)" != "x" ]; then \
 		$(MAKE) $(OBJECTS) || exit;		\
 		printf "%10s     %-20s\n" LINK $@; \
 		$(AR) cr $@ $(OBJECTS); \
 	fi
 
-$(OBJECTIVE_BINS): $(OBJECTS)
+$(OBJECTIVE_BINS): $(OBJECTS) $(LIBDEP)
 	if [ "x$(OBJECTS)" != "x" ]; then \
 		$(MAKE) $(OBJECTS) || exit;		\
 		printf "%10s     %-20s\n" LINK $@; \
--- a/src/aac/libfaad2/Makefile	Fri Mar 23 06:46:04 2007 -0700
+++ b/src/aac/libfaad2/Makefile	Sat Mar 24 09:08:58 2007 -0700
@@ -19,6 +19,3 @@
 OBJECTS = ${SOURCES:.c=.o}
 
 include ../../../mk/objective.mk
-
-libfaad.a: $(OBJECTS)
-	$(AR) cq $@ $(OBJECTS)
--- a/src/aac/mp4ff/Makefile	Fri Mar 23 06:46:04 2007 -0700
+++ b/src/aac/mp4ff/Makefile	Sat Mar 24 09:08:58 2007 -0700
@@ -11,6 +11,3 @@
 CFLAGS += $(PICFLAGS) -DUSE_TAGGING=1 -fsigned-char -I../../..
 
 include ../../../mk/objective.mk
-
-libmp4ff.a: $(OBJECTS)
-	$(AR) cq $@ $(OBJECTS)
--- a/src/aac/src/Makefile	Fri Mar 23 06:46:04 2007 -0700
+++ b/src/aac/src/Makefile	Sat Mar 24 09:08:58 2007 -0700
@@ -14,6 +14,8 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
+LIBDEP = ../libfaad2/libfaad.a ../mp4ff/libmp4ff.a
+
 CFLAGS += $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../.. -I../include -I../libfaad -I../mp4ff
 
 include ../../../mk/objective.mk
--- a/src/adplug/Makefile	Fri Mar 23 06:46:04 2007 -0700
+++ b/src/adplug/Makefile	Sat Mar 24 09:08:58 2007 -0700
@@ -12,6 +12,8 @@
 
 OBJECTS = ${SOURCES:.cc=.o}
 
+LIBDEP = ./core/libadplugcore.a
+
 CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(BINIO_CFLAGS) \
 	-I../../intl -I../.. -I./core
 CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(BINIO_CFLAGS) \
--- a/src/amidi-plug/Makefile	Fri Mar 23 06:46:04 2007 -0700
+++ b/src/amidi-plug/Makefile	Sat Mar 24 09:08:58 2007 -0700
@@ -22,6 +22,8 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
+LIBDEP = ./pcfg/libpcfg.a
+
 CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(GMODULE_CFLAGS) -DAMIDIPLUGBACKENDDIR=\"$(AMIDIPLUGBACKENDDIR)\" \
           -I../../intl -I../..
 
--- a/src/amidi-plug/backend-alsa/Makefile	Fri Mar 23 06:46:04 2007 -0700
+++ b/src/amidi-plug/backend-alsa/Makefile	Sat Mar 24 09:08:58 2007 -0700
@@ -14,4 +14,6 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
+LIBDEP =  ../pcfg/libpcfg.a
+
 include ../../../mk/objective.mk
--- a/src/amidi-plug/backend-dummy/Makefile	Fri Mar 23 06:46:04 2007 -0700
+++ b/src/amidi-plug/backend-dummy/Makefile	Sat Mar 24 09:08:58 2007 -0700
@@ -14,4 +14,6 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
+LIBDEP = ../pcfg/libpcfg.a
+
 include ../../../mk/objective.mk
--- a/src/amidi-plug/backend-fluidsynth/Makefile	Fri Mar 23 06:46:04 2007 -0700
+++ b/src/amidi-plug/backend-fluidsynth/Makefile	Sat Mar 24 09:08:58 2007 -0700
@@ -14,4 +14,6 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
+LIBDEP =  ../pcfg/libpcfg.a
+
 include ../../../mk/objective.mk
--- a/src/flac/Makefile	Fri Mar 23 06:46:04 2007 -0700
+++ b/src/flac/Makefile	Sat Mar 24 09:08:58 2007 -0700
@@ -32,6 +32,8 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
+LIBDEP = libflac/libaudflac.a plugin_common/libplugin_common.a
+
 # XXX: debian
 CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../.. -I./libflac $(OGG_VORBIS_CFLAGS)
 
--- a/src/flac/libflac/Makefile	Fri Mar 23 06:46:04 2007 -0700
+++ b/src/flac/libflac/Makefile	Sat Mar 24 09:08:58 2007 -0700
@@ -30,7 +30,4 @@
 
 CFLAGS += $(PICFLAGS) -I. -IFLAC $(OGG_VORBIS_CFLAGS)
 
-libaudflac.a: ${OBJECTS}
-	${AR} cq $@ ${OBJECTS}
-
 include ../../../mk/objective.mk
--- a/src/flac/plugin_common/Makefile	Fri Mar 23 06:46:04 2007 -0700
+++ b/src/flac/plugin_common/Makefile	Sat Mar 24 09:08:58 2007 -0700
@@ -22,7 +22,4 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
-libplugin_common.a: $(OBJECTS)
-	$(AR) cq $@ $(OBJECTS)
-
 include ../../../mk/objective.mk
--- a/src/modplug/Makefile	Fri Mar 23 06:46:04 2007 -0700
+++ b/src/modplug/Makefile	Sat Mar 24 09:08:58 2007 -0700
@@ -47,5 +47,7 @@
 
 OBJECTS = ${SOURCES:.cxx=.o}
 
+LIBDEP = gui/libgui.a archive/libarchive.a
+
 include ../../mk/objective.mk
 
--- a/src/modplug/archive/Makefile	Fri Mar 23 06:46:04 2007 -0700
+++ b/src/modplug/archive/Makefile	Sat Mar 24 09:08:58 2007 -0700
@@ -16,6 +16,3 @@
 OBJECTS = ${SOURCES:.cxx=.o}
 
 include ../../../mk/objective.mk
-
-libarchive.a: $(OBJECTS)
-	$(AR) cq $@ $(OBJECTS)
--- a/src/modplug/gui/Makefile	Fri Mar 23 06:46:04 2007 -0700
+++ b/src/modplug/gui/Makefile	Sat Mar 24 09:08:58 2007 -0700
@@ -10,6 +10,3 @@
 OBJECTS = ${SOURCES:.cxx=.o}
 
 include ../../../mk/objective.mk
-
-libgui.a: $(OBJECTS)
-	$(AR) cq $@ $(OBJECTS)
--- a/src/paranormal/Makefile	Fri Mar 23 06:46:04 2007 -0700
+++ b/src/paranormal/Makefile	Sat Mar 24 09:08:58 2007 -0700
@@ -28,6 +28,8 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
+LIBDEP = libcalc/libcalc.a
+
 CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) $(SDL_CFLAGS) -I../../intl -I../..
 
 include ../../mk/objective.mk
--- a/src/paranormal/libcalc/Makefile	Fri Mar 23 06:46:04 2007 -0700
+++ b/src/paranormal/libcalc/Makefile	Sat Mar 24 09:08:58 2007 -0700
@@ -14,6 +14,3 @@
 CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) $(SDL_CFLAGS) -I../../intl -I../..
 
 include ../../../mk/objective.mk
-
-libcalc.a: $(OBJECTS)
-	$(AR) cq $@ $(OBJECTS)
--- a/src/rovascope/Makefile	Fri Mar 23 06:46:04 2007 -0700
+++ b/src/rovascope/Makefile	Sat Mar 24 09:08:58 2007 -0700
@@ -27,6 +27,8 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
+LIBDEP = libcalc/libcalc.a
+
 CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) $(SDL_CFLAGS) -I../../intl -I../..
 
 include ../../mk/objective.mk
--- a/src/rovascope/libcalc/Makefile	Fri Mar 23 06:46:04 2007 -0700
+++ b/src/rovascope/libcalc/Makefile	Sat Mar 24 09:08:58 2007 -0700
@@ -15,5 +15,3 @@
 
 include ../../../mk/objective.mk
 
-libcalc.a: $(OBJECTS)
-	$(AR) cq $@ $(OBJECTS)
--- a/src/timidity/libtimidity/Makefile	Fri Mar 23 06:46:04 2007 -0700
+++ b/src/timidity/libtimidity/Makefile	Sat Mar 24 09:08:58 2007 -0700
@@ -8,7 +8,6 @@
 	instrum.c \
 	instrum_dls.c \
 	mix.c \
-	options.h \
 	output.c \
 	playmidi.c \
 	readmidi.c \
@@ -22,6 +21,3 @@
 OBJECTS = ${SOURCES:.c=.o}
 
 include ../../../mk/objective.mk
-
-libtimidity.a: $(OBJECTS)
-	$(AR) cq $@ $(OBJECTS)
--- a/src/timidity/src/Makefile	Fri Mar 23 06:46:04 2007 -0700
+++ b/src/timidity/src/Makefile	Sat Mar 24 09:08:58 2007 -0700
@@ -14,6 +14,8 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
+LIBDEP = ../libtimidity/libtimidity.a
+
 CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../.. -I../libtimidity
 
 include ../../../mk/objective.mk
--- a/src/wma/Makefile	Fri Mar 23 06:46:04 2007 -0700
+++ b/src/wma/Makefile	Sat Mar 24 09:08:58 2007 -0700
@@ -13,6 +13,8 @@
 
 OBJECTS = ${SOURCES:.c=.o}
 
+LIBDEP = ./libffwma/libffwma.a
+
 CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../.. -I./libffwma -std=c99
 
 include ../../mk/objective.mk
--- a/src/wma/libffwma/Makefile	Fri Mar 23 06:46:04 2007 -0700
+++ b/src/wma/libffwma/Makefile	Sat Mar 24 09:08:58 2007 -0700
@@ -4,20 +4,15 @@
 OBJECTIVE_LIBS_NOINST=	libffwma.a
 
 SOURCES=	allcodecs.c allformats.c \
-		asf.c avcodec.h avformat.h \
-		avi.h avio.c avio.h aviobuf.c \
-		bswap.h common.c common.h \
-		cutils.c cutils.h dsputil.c dsputil.h \
+		asf.c avio.c aviobuf.c \
+		common.c cutils.c dsputil.c \
 		fft.c file.c futils.c mdct.c \
-		os_support.c os_support.h \
-		parser.c simple_idct.c simple_idct.h \
-		utils.h utils.c wmadata.h wmadec.c mem.c uri.c
+		os_support.c \
+		parser.c simple_idct.c \
+		utils.c wmadec.c mem.c uri.c
 
 CFLAGS+=	$(PICFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -c -I../../..
 
 OBJECTS=${SOURCES:.c=.o}
 
 include ../../../mk/objective.mk
-
-libffwma.a: $(OBJECTS)
-	$(AR) cq $@ $(OBJECTS)