changeset 1870:ef9a2f666404 trunk

[svn] - rename libaudacious/Makefile.in -> libaudacious/Makefile as autoconf macro expansion is not needed here
author nenolod
date Sat, 14 Oct 2006 11:33:25 -0700
parents b7cac9c9c4a1
children 1749ad179a1c
files ChangeLog configure.ac libaudacious/Makefile libaudacious/Makefile.in
diffstat 4 files changed, 61 insertions(+), 54 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Oct 13 11:08:02 2006 -0700
+++ b/ChangeLog	Sat Oct 14 11:33:25 2006 -0700
@@ -1,3 +1,11 @@
+2006-10-13 18:08:02 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
+  revision [2695]
+  - audacious_determine_session_type() would crash if audacious_session_uri had value.
+  
+  trunk/libaudacious/beepctrl.c |    4 ++--
+  1 file changed, 2 insertions(+), 2 deletions(-)
+
+
 2006-10-13 04:12:58 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [2693]
   - pls doesn't go along with PLAYLIST_LOCK in playlist_save().
--- a/configure.ac	Fri Oct 13 11:08:02 2006 -0700
+++ b/configure.ac	Sat Oct 14 11:33:25 2006 -0700
@@ -385,7 +385,6 @@
 	audacious.pc
 	audacious/audacious.desktop
 	audacious/images/Makefile
-	libaudacious/Makefile
 	libguess/Makefile
 	librcd/Makefile
 	po/Makefile.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libaudacious/Makefile	Sat Oct 14 11:33:25 2006 -0700
@@ -0,0 +1,53 @@
+include ../mk/rules.mk
+include ../mk/init.mk
+
+PICLDFLAGS = $(LIBLDFLAGS)
+
+beepincludedir = $(includedir)/audacious
+
+OBJECTIVE_LIBS = libaudacious$(SHARED_SUFFIX)
+OBJECTIVE_SONAME_SUFFIX = 3.0.0
+
+LIBADD = \
+	$(GTK_LIBS)      \
+	$(GCONF_LIBS)    \
+	$(GNOMEVFS_LIBS)
+
+CFLAGS += $(PICFLAGS) \
+	$(GTK_CFLAGS)        \
+	$(GCONF_CFLAGS)      \
+	$(GNOMEVFS_CFLAGS)   \
+	-I..		      \
+	-I../intl
+
+CONF_SRC = configdb_$(CONFIGDB_BACKEND).c
+VFS_SRC = vfs_$(VFS_BACKEND).c vfs_common.c
+
+SOURCES = \
+	$(CONF_SRC) \
+	rcfile.c \
+	$(VFS_SRC) \
+	beepctrl.c \
+	dirbrowser.c \
+	util.c \
+	formatter.c \
+	titlestring.c \
+	xentry.c \
+	xconvert.c \
+	xml_document.c
+
+OBJECTS = ${SOURCES:.c=.o}
+
+HEADERS = \
+	vfs.h rcfile.h configdb.h \
+	beepctrl.h dirbrowser.h \
+	formatter.h titlestring.h xentry.h xconvert.h xml_document.h
+
+include ../mk/objective.mk
+
+install-posthook:
+	@mv ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX) ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX).3.0.0
+	@ln -sf ${LIBDIR}/libaudacious$(SHARED_SUFFIX).3.0.0 \
+		${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX).3
+	@ln -sf ${LIBDIR}/libaudacious$(SHARED_SUFFIX).3 \
+		${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX)
--- a/libaudacious/Makefile.in	Fri Oct 13 11:08:02 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-include ../mk/rules.mk
-include ../mk/init.mk
-
-PICLDFLAGS = $(LIBLDFLAGS)
-
-beepincludedir = $(includedir)/audacious
-
-OBJECTIVE_LIBS = libaudacious$(SHARED_SUFFIX)
-OBJECTIVE_SONAME_SUFFIX = 3.0.0
-
-LIBADD = \
-	$(GTK_LIBS)      \
-	$(GCONF_LIBS)    \
-	$(GNOMEVFS_LIBS)
-
-CFLAGS += $(PICFLAGS) \
-	$(GTK_CFLAGS)        \
-	$(GCONF_CFLAGS)      \
-	$(GNOMEVFS_CFLAGS)   \
-	-I..		      \
-	-I../intl
-
-CONF_SRC = configdb_$(CONFIGDB_BACKEND).c
-VFS_SRC = vfs_$(VFS_BACKEND).c vfs_common.c
-
-SOURCES = \
-	$(CONF_SRC) \
-	rcfile.c \
-	$(VFS_SRC) \
-	beepctrl.c \
-	dirbrowser.c \
-	util.c \
-	formatter.c \
-	titlestring.c \
-	xentry.c \
-	xconvert.c \
-	xml_document.c
-
-OBJECTS = ${SOURCES:.c=.o}
-
-HEADERS = \
-	vfs.h rcfile.h configdb.h \
-	beepctrl.h dirbrowser.h \
-	formatter.h titlestring.h xentry.h xconvert.h xml_document.h
-
-include ../mk/objective.mk
-
-install-posthook:
-	@mv ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX) ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX).3.0.0
-	@ln -sf ${LIBDIR}/libaudacious$(SHARED_SUFFIX).3.0.0 \
-		${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX).3
-	@ln -sf ${LIBDIR}/libaudacious$(SHARED_SUFFIX).3 \
-		${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX)