changeset 1804:fe62b69ceb90

Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
author William Pitcock <nenolod@atheme.org>
date Mon, 24 Sep 2007 12:51:19 -0500
parents bc676d17cf7f (current diff) 877a36a055a3 (diff)
children ec6c92d79a16 efa9fa7c699b
files src/sid/config.h.in
diffstat 3 files changed, 28 insertions(+), 173 deletions(-) [+]
line wrap: on
line diff
--- a/src/sid/Makefile	Mon Sep 24 12:51:06 2007 -0500
+++ b/src/sid/Makefile	Mon Sep 24 12:51:19 2007 -0500
@@ -1,45 +1,30 @@
-include ../../mk/rules.mk
-include ../../mk/init.mk
-
-OBJECTIVE_LIBS = libsid$(SHARED_SUFFIX)
-
-###
-### Source targets
-###
-EXTRA_DIST = xmms-sid-logo.xpm
-
-# Generals
-TMPFLAGS = $(PICFLAGS) -D_REENTRANT $(PLUGIN_CFLAGS) $(SIDPLAY1_INCLUDES) $(SIDPLAY2_INCLUDES) $(BUILDERS_INCLUDES) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../.. -DAUDACIOUS_PLUGIN
-CFLAGS   += $(TMPFLAGS)
-CXXFLAGS  += $(TMPFLAGS)
-
-# Generated libraries
-
-LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
+PLUGIN = sid${PLUGIN_SUFFIX}
+SRCS = xs_init.c	\
+       xs_about.c	\
+       xs_support.c	\
+       xs_config.c	\
+       xs_md5.c		\
+       xs_length.c	\
+       xs_genui.c	\
+       xs_glade.c	\
+       xs_interface.c	\
+       xs_stil.c	\
+       xs_fileinfo.c	\
+       xs_filter.c	\
+       xs_sidplay1.cc	\
+       xs_sidplay2.cc	\
+       xs_curve.c	\
+       xs_slsup.c	\
+       xmms-sid.c
 
-LDFLAGS += $(BUILDERS_LDFLAGS)
-LIBADD  = $(SIDPLAY1_LDADD) $(SIDPLAY2_LDADD) $(RESID_LDADD) $(HARDSID_LDADD) $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) -lstdc++
-SOURCES =	\
-	xs_init.c	\
-	xs_about.c	\
-	xs_support.c	\
-	xs_config.c	\
-	xs_md5.c	\
-	xs_length.c	\
-	xs_genui.c	\
-	xs_glade.c	\
-	xs_interface.c	\
-	xs_stil.c	\
-	xs_fileinfo.c	\
-	xs_filter.c	\
-	xs_sidplay1.cc	\
-	xs_sidplay2.cc	\
-	xs_curve.c	\
-	xs_slsup.c	\
-	xmms-sid.c
+plugindir = audacious/${INPUT_PLUGIN_DIR}
+
+include ../../buildsys.mk
+include ../../extra.mk
 
-OBJECTS1 = ${SOURCES:.c=.o}
-OBJECTS = ${OBJECTS1:.cc=.o}
+LD = ${CXX}
 
-include ../../mk/objective.mk
-
+CPPFLAGS += ${PLUGIN_CPPFLAGS} -D_REENTRANT -I../../intl -I../.. -DAUDACIOUS_PLUGIN ${MOWGLI_CFLAGS} ${SIDPLAY1_INCLUDES} ${SIDPLAY2_INCLUDES} ${BUILDERS_INCLUDES} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS}
+CFLAGS += ${PLUGIN_CFLAGS}
+CXXFLAGS += ${PLUGIN_CFLAGS}
+LIBS += ${SIDPLAY1_LDADD} ${SIDPLAY2_LDADD} ${HARDSID_LDADD} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
--- a/src/sid/config.h.in	Mon Sep 24 12:51:06 2007 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +0,0 @@
-/* src/config.h.in.  Generated from configure.in by autoheader.  */
-
-/* If this macro is defined, a BMP plugin will be built instead of XMMS one.
-   */
-#undef BUILD_FOR_BMP
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define if you have HardSID with libSIDPlay 2 */
-#undef HAVE_HARDSID_BUILDER
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
-   to 0 otherwise. */
-#undef HAVE_MALLOC
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `memset' function. */
-#undef HAVE_MEMSET
-
-/* Define if you have reSID with libSIDPlay 2 */
-#undef HAVE_RESID_BUILDER
-
-/* Define if you have and want to use libSIDPlay 1 */
-#undef HAVE_SIDPLAY1
-
-/* Define if you have and want to use libSIDPlay 2 */
-#undef HAVE_SIDPLAY2
-
-/* Define if you have XMMS patched with the songpos patch. */
-#undef HAVE_SONG_POSITION
-
-/* Define to 1 if `stat' has the bug that it succeeds when given the
-   zero-length file name argument. */
-#undef HAVE_STAT_EMPTY_STRING_BUG
-
-/* Define to 1 if stdbool.h conforms to C99. */
-#undef HAVE_STDBOOL_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
-/* Define to 1 if you have the `strerror' function. */
-#undef HAVE_STRERROR
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define if you have XMMS version 1.2.5 or later and you want XMMS-SID to
-   support some extra features. */
-#undef HAVE_XMMSEXTRA
-
-/* Define to 1 if the system has the type `_Bool'. */
-#undef HAVE__BOOL
-
-/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
-   slash. */
-#undef LSTAT_FOLLOWS_SLASHED_SYMLINK
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#undef inline
-#endif
-
-/* Define to rpl_malloc if the replacement function should be used. */
-#undef malloc
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-#undef size_t
-
-/* Define to empty if the keyword `volatile' does not work. Warning: valid
-   code using `volatile' can become incorrect without. Disable with care. */
-#undef volatile
--- a/src/sid/xmms-sid.h	Mon Sep 24 12:51:06 2007 -0500
+++ b/src/sid/xmms-sid.h	Mon Sep 24 12:51:19 2007 -0500
@@ -23,6 +23,7 @@
 #ifndef XMMS_SID_H
 #define XMMS_SID_H
 
+#include <config.h>
 #include "xs_support.h"
 
 #ifdef __cplusplus