diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/Makefile.am | 13 | ||||
| -rw-r--r-- | ext/arts/Makefile.am | 19 |
2 files changed, 16 insertions, 16 deletions
diff --git a/ext/Makefile.am b/ext/Makefile.am index 171b2241..f64131a1 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -94,6 +94,12 @@ else HERMES_DIR= endif +if USE_HTTP +HTTP_DIR=gnomevfs +else +HTTP_DIR= +endif + if USE_LAME LAME_DIR=lame else @@ -164,12 +170,11 @@ SUBDIRS=$(A52_DIR) $(AALIB_DIR) $(ALSA_DIR) \ $(ARTS_DIR) $(ARTSC_DIR) $(AUDIOFILE_DIR) \ $(AVIFILE_DIR) $(CDPARANOIA_DIR) $(DV_DIR) $(DVDREAD_DIR) $(ESD_DIR) \ $(FESTIVAL_DIR) $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) $(HERMES_DIR) \ - $(JPEG_DIR) $(LAME_DIR) $(MAD_DIR) $(MIKMOD_DIR) $(MPEG2DEC_DIR) \ + $(HTTP_DIR) $(JPEG_DIR) $(LAME_DIR) $(MAD_DIR) $(MIKMOD_DIR) $(MPEG2DEC_DIR) \ $(OPENQUICKTIME_DIR) $(RTP_DIR) $(SDL_DIR) $(SHOUT_DIR) $(VORBIS_DIR) \ $(XMMS_DIR) -# fixme : add arts and artsd -DIST_SUBDIRS=a52 aalib alsa avifile audiofile cdparanoia \ +DIST_SUBDIRS=a52 aalib alsa arts artsd avifile audiofile cdparanoia \ dv dvdread esd \ - festival flac gnomevfs gsm hermes jpeg lame mad mikmod mpeg2dec \ + festival flac gnomevfs gsm hermes http jpeg lame mad mikmod mpeg2dec \ openquicktime rtp sdl shout vorbis xmms diff --git a/ext/arts/Makefile.am b/ext/arts/Makefile.am index 0be9ebb4..684cc1c9 100644 --- a/ext/arts/Makefile.am +++ b/ext/arts/Makefile.am @@ -1,17 +1,17 @@ -filterdir = $(libdir)/gst +plugindir = $(libdir)/gst -filter_LTLIBRARIES = libgst_arts.la +plugin_LTLIBRARIES = libgstarts.la gst_artsio_impl.lo: gst_artsio.cc SUFFIXES = .idl .idl.cc: - mcopidl -t $< $(ARTS_MCOPFLAGS) + mcopidl -t $< $(ARTS_CXXFLAGS) # mcopidl Extension Expansion Technology clean up CLEANFILES = gst_artsio.h gst_artsio.cc gst_artsio.mcopclass gst_artsio.mcoptype -libgst_arts_la_SOURCES = gst_arts.c gst_artsio.cc gst_artsio_impl.cc +libgstarts_la_SOURCES = gst_arts.c gst_artsio.cc gst_artsio_impl.cc noinst_HEADERS = gst_arts.h gst_artsio_impl.h # FIXME automake 1.4 hack, 1.5 should let us put the .idl in @@ -20,11 +20,6 @@ EXTRA_DIST = gst_artsio.idl dist-hook: rm -f $(distdir)/gst_artsio.cc -# gst_artsio.cc and gst_artsio.h are generated from the idl, and the tools -# needed to do this should be present on any platform where the rest of arts -# is present: therefore, these don't need to go in the dist. -#EXTRA_DIST = gst_artsio.cc gst_artsio.h - -libgst_arts_la_CFLAGS = $(ARTS_CFLAGS) -libgst_arts_la_CXXFLAGS = $(ARTS_CFLAGS) $(CFLAGS) -libgst_arts_la_LDFLAGS = $(ARTS_LIBS) +libgstarts_la_CFLAGS = $(GST_CFLAGS) +libgstarts_la_CXXFLAGS = $(ARTS_CXXFLAGS) $(GST_CFLAGS) +libgstarts_la_LIBADD = $(ARTS_LIBS) |