diff options
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | plugins/shn/Makefile | 22 | ||||
| -rw-r--r-- | plugins/shn/Makefile.am | 10 |
3 files changed, 23 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index 9c6daa3c..3d2eaa72 100644 --- a/configure.ac +++ b/configure.ac @@ -102,7 +102,6 @@ AC_ARG_ENABLE(tta, [AS_HELP_STRING([--disable-tta ], [disable tta plugi AC_ARG_ENABLE(dca, [AS_HELP_STRING([--disable-dca ], [disable dca (DTS audio) plugin (default: enabled)])], [enable_dca=$enableval], [enable_dca=yes]) AC_ARG_ENABLE(aac, [AS_HELP_STRING([--disable-aac ], [disable AAC decoder based on FAAD2 (default: enabled)])], [enable_aac=$enableval], [enable_aac=yes]) AC_ARG_ENABLE(mms, [AS_HELP_STRING([--disable-mms ], [disable MMS streaming vfs plugin (default: enabled)])], [enable_mms=$enableval], [enable_mms=yes]) -AC_ARG_ENABLE(shn, [AS_HELP_STRING([--disable-shn ], [disable shorten plugin (default: enabled)])], [enable_shn=$enableval], [enable_shn=yes]) AC_ARG_ENABLE(staticlink, [AS_HELP_STRING([--enable-staticlink], [link everything statically (default: disabled)])], [enable_staticlink=$enableval], [enable_staticlink=no]) AC_ARG_ENABLE(portable, [AS_HELP_STRING([--enable-portable ], [make portable build (default: disabled, opts: yes,no,full)])], [enable_portable=$enableval], [enable_portable=no]) AC_ARG_ENABLE(src, [AS_HELP_STRING([--enable-src ], [build libsamplerate (SRC) plugin (default: auto)])], [enable_src=$enableval], [enable_src=yes]) @@ -483,15 +482,11 @@ if test "x$enable_mms" != "xno" ; then HAVE_MMS=yes fi -if test "x$enable_shn" != "xno" ; then - HAVE_SHN=yes -fi - if test "x$enable_m3u" != "xno" ; then HAVE_M3U=yes fi -PLUGINS_DIRS="plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shn plugins/shellexec plugins/dsp_libsrc plugins/m3u" +PLUGINS_DIRS="plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/dsp_libsrc plugins/m3u" AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBISPLUGIN" = "xyes") AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLACPLUGIN" = "xyes") @@ -523,7 +518,6 @@ AM_CONDITIONAL(HAVE_TTA, test "x$HAVE_TTA" = "xyes") AM_CONDITIONAL(HAVE_DCA, test "x$HAVE_DCA" = "xyes") AM_CONDITIONAL(HAVE_AAC, test "x$HAVE_AAC" = "xyes") AM_CONDITIONAL(HAVE_MMS, test "x$HAVE_MMS" = "xyes") -AM_CONDITIONAL(HAVE_SHN, test "x$HAVE_SHN" = "xyes") AM_CONDITIONAL(STATICLINK, test "x$STATICLINK" = "xyes") AM_CONDITIONAL(PORTABLE, test "x$PORTABLE" = "xyes") AM_CONDITIONAL(PORTABLE_FULL, test "x$PORTABLE_FULL" = "xyes") @@ -586,7 +580,6 @@ PRINT_PLUGIN_INFO([tta],[TTA player plugin],[test "x$HAVE_TTA" = "xyes"]) PRINT_PLUGIN_INFO([dca],[libdca (DTS Audio) player plugin],[test "x$HAVE_DCA" = "xyes"]) PRINT_PLUGIN_INFO([aac],[AAC player (m4a, aac, mp4) based on FAAD2],[test "x$HAVE_AAC" = "xyes"]) PRINT_PLUGIN_INFO([mms],[mms streaming support],[test "x$HAVE_MMS" = "xyes"]) -PRINT_PLUGIN_INFO([shn],[shorten player based on xmms-shn],[test "x$HAVE_SHN" = "xyes"]) PRINT_PLUGIN_INFO([dsp_src],[High quality samplerate conversion using libsamplerate],[test "x$HAVE_DSP_SRC" = "xyes"]) PRINT_PLUGIN_INFO([m3u],[M3U and PLS playlist support],[test "x$HAVE_M3U" = "xyes"]) @@ -626,7 +619,6 @@ plugins/tta/Makefile plugins/dca/Makefile plugins/aac/Makefile plugins/mms/Makefile -plugins/shn/Makefile plugins/dsp_libsrc/Makefile plugins/m3u/Makefile intl/Makefile diff --git a/plugins/shn/Makefile b/plugins/shn/Makefile new file mode 100644 index 00000000..a87ac1ec --- /dev/null +++ b/plugins/shn/Makefile @@ -0,0 +1,22 @@ +OUT=shn.so + +CC=gcc + +CFLAGS=-Wall -std=c99 -D_GNU_SOURCE -DHAVE_CONFIG_H -I. -I../.. + +LDFLAGS=-module -shared -fPIC -lm + +SOURCES=array.c convert.c misc.c output.c seek.c shn.c shorten.c sulawalaw.c vario.c wave.c + +OBJECTS=$(SOURCES:.c=.o) + +all: $(SOURCES) $(OUT) + +$(OUT): $(OBJECTS) + $(CC) $(LDFLAGS) $(OBJECTS) -o $@ + +.c.o: + $(CC) $(CFLAGS) $< -c -o $@ + +clean: + rm $(OBJECTS) $(OUT) diff --git a/plugins/shn/Makefile.am b/plugins/shn/Makefile.am deleted file mode 100644 index 335dacff..00000000 --- a/plugins/shn/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -if HAVE_SHN -shndir = $(libdir)/$(PACKAGE) -pkglib_LTLIBRARIES = shn.la -shn_la_SOURCES = array.c convert.c misc.c output.c seek.c shn.c shn.h shorten.c shorten.h sulawalaw.c vario.c wave.c bitshift.h - -shn_la_LDFLAGS = -module - -shn_la_LIBADD = $(LDADD) -lm -AM_CFLAGS = $(CFLAGS) -std=c99 -endif |