Mercurial > audlegacy
changeset 2631:a2afa6ca7294 trunk
[svn] - integrate libmowgli requirement into buildsystem
| author | nenolod |
|---|---|
| date | Tue, 20 Mar 2007 21:39:00 -0700 |
| parents | e7e1df8afffb |
| children | eefcf9c62175 |
| files | ChangeLog Doxyfile configure.ac mk/rules.mk.in src/audacious/Makefile src/audacious/build_stamp.c src/libaudacious/Makefile |
| diffstat | 7 files changed, 26 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Mar 19 08:41:23 2007 -0700 +++ b/ChangeLog Tue Mar 20 21:39:00 2007 -0700 @@ -1,3 +1,11 @@ +2007-03-19 15:41:23 +0000 Yoshiki Yazawa <yaz@cc.rim.or.jp> + revision [4278] + - tweak wrong indentations. + + trunk/src/audacious/signals.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + + 2007-03-19 15:35:08 +0000 Yoshiki Yazawa <yaz@cc.rim.or.jp> revision [4276] simplify and enhance signal handler:
--- a/Doxyfile Mon Mar 19 08:41:23 2007 -0700 +++ b/Doxyfile Tue Mar 20 21:39:00 2007 -0700 @@ -23,7 +23,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = $Id: Doxyfile 4254 2007-03-13 20:32:56Z nenolod $ +PROJECT_NUMBER = $Id: Doxyfile 4280 2007-03-21 04:39:00Z nenolod $ # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. @@ -106,7 +106,7 @@ # path before files name in the file list and in the header files. If set # to NO the shortest path that makes the file name unique will be used. -FULL_PATH_NAMES = YES +FULL_PATH_NAMES = NO # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag # can be used to strip a user-defined part of the path. Stripping is @@ -556,7 +556,7 @@ # Note: To get rid of all source code in the generated output, make sure also # VERBATIM_HEADERS is set to NO. -SOURCE_BROWSER = NO +SOURCE_BROWSER = YES # Setting the INLINE_SOURCES tag to YES will include the body # of functions and classes directly in the documentation.
--- a/configure.ac Mon Mar 19 08:41:23 2007 -0700 +++ b/configure.ac Tue Mar 20 21:39:00 2007 -0700 @@ -93,13 +93,20 @@ [AC_MSG_ERROR([Cannot find glib2/gtk2/pango])] ) -dnl Check for GLib +dnl Check for GLib. PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.6.0], [ADD_PC_REQUIRES([glib-2.0 >= 2.6.0])], [AC_MSG_ERROR([Cannot find glib2])] ) +dnl Check for libmowgli. + +PKG_CHECK_MODULES(MOWGLI, [libmowgli >= 0.1.1], + [ADD_PC_REQUIRES([libmowgli >= 0.1.1])], + [AC_MSG_ERROR([Cannot find libmowgli: try http://sacredspiral.co.uk/~nenolod/mowgli])] +) + dnl Check for libglade PKG_CHECK_MODULES(LIBGLADE, [libglade-2.0 >= 2.3.1],
--- a/mk/rules.mk.in Mon Mar 19 08:41:23 2007 -0700 +++ b/mk/rules.mk.in Tue Mar 20 21:39:00 2007 -0700 @@ -329,3 +329,5 @@ INTL_OBJECTIVE ?= @INTL_OBJECTIVE@ LIBMCS_CFLAGS ?= @LIBMCS_CFLAGS@ LIBMCS_LIBS ?= @LIBMCS_LIBS@ +MOWGLI_CFLAGS ?= @MOWGLI_CFLAGS@ +MOWGLI_LIBS ?= @MOWGLI_LIBS@
--- a/src/audacious/Makefile Mon Mar 19 08:41:23 2007 -0700 +++ b/src/audacious/Makefile Tue Mar 20 21:39:00 2007 -0700 @@ -14,11 +14,13 @@ $(samplerate_LIBS) \ $(CHARDET_LIBS) \ $(GTK_LIBS) \ + $(MOWGLI_LIBS) \ $(LIBGLADE_LIBS) \ $(REGEX_LIBS) \ ./widgets/libwidgets.a CFLAGS += \ + $(MOWGLI_CFLAGS) \ $(GTK_CFLAGS) \ $(LIBGLADE_CFLAGS) \ $(BEEP_DEFINES) \
--- a/src/audacious/build_stamp.c Mon Mar 19 08:41:23 2007 -0700 +++ b/src/audacious/build_stamp.c Tue Mar 20 21:39:00 2007 -0700 @@ -1,2 +1,2 @@ #include <glib.h> -const gchar *svn_stamp = "20070319-4276"; +const gchar *svn_stamp = "20070319-4278";
--- a/src/libaudacious/Makefile Mon Mar 19 08:41:23 2007 -0700 +++ b/src/libaudacious/Makefile Tue Mar 20 21:39:00 2007 -0700 @@ -9,10 +9,12 @@ LIBADD = \ $(GTK_LIBS) \ + $(MOWGLI_LIBS) \ $(GCONF_LIBS) \ $(LIBMCS_LIBS) CFLAGS += $(PICFLAGS) \ + $(MOWGLI_CFLAGS) \ $(GTK_CFLAGS) \ $(GCONF_CFLAGS) \ $(LIBMCS_CFLAGS) \