much build fixage turns out synaesthesia and smoothwav depend on gtk, maybe they should go to ext/

Original commit message from CVS:
much build fixage
turns out synaesthesia and smoothwav depend on gtk, maybe they should go to
ext/
This commit is contained in:
Andy Wingo 2001-12-23 04:38:37 +00:00
parent 3d4da9a8df
commit c05f8dc809
5 changed files with 30 additions and 13 deletions

View file

@ -1,5 +1,5 @@
SUBDIRS=gst sys ext gst-libs SUBDIRS=gst-libs gst sys ext
DIST_SUBDIRS=gst sys ext gst-libs DIST_SUBDIRS=gst-libs gst sys ext
EXTRA_DIST=gst-plugins.spec AUTHORS COPYING README ChangeLog EXTRA_DIST=gst-plugins.spec AUTHORS COPYING README ChangeLog

View file

@ -311,6 +311,21 @@ AC_ARG_WITH(plugins,
AC_SUBST(GST_PLUGINS_SELECTED) AC_SUBST(GST_PLUGINS_SELECTED)
dnl needed for smoothwave, FIXME!
if test x$USE_GLIB2 = xno; then
AM_PATH_GTK(1.2.0,,
AC_MSG_ERROR(Cannot find gtk: Is gtk-config in path?))
HAVE_GTK=yes
# we have to have it
else
PKG_CHECK_MODULES(GTK2, gtk+-2.0, HAVE_GTK=yes, HAVE_GTK=no)
GTK_CFLAGS=$GTK2_CFLAGS
GTK_LIBS=$GTK2_LIBS
fi
AC_SUBST(GTK_LIBS)
AC_SUBST(GTK_CFLAGS)
dnl ========================================================================== dnl ==========================================================================
dnl ============================= sys plugins ================================ dnl ============================= sys plugins ================================
dnl ========================================================================== dnl ==========================================================================
@ -1076,7 +1091,6 @@ sys/vcd/Makefile
sys/vga/Makefile sys/vga/Makefile
sys/xvideo/Makefile sys/xvideo/Makefile
ext/Makefile ext/Makefile
ext/a52/Makefile
ext/aalib/Makefile ext/aalib/Makefile
ext/alsa/Makefile ext/alsa/Makefile
ext/audiofile/Makefile ext/audiofile/Makefile
@ -1088,6 +1102,7 @@ ext/vorbis/Makefile
gst-libs/Makefile gst-libs/Makefile
gst-libs/gst/Makefile gst-libs/gst/Makefile
gst-libs/gst/audio/Makefile gst-libs/gst/audio/Makefile
gst-libs/gst/resample/Makefile
gst-plugins.spec gst-plugins.spec
) )

View file

@ -1,8 +1,8 @@
if USE_A52 #if USE_A52
A52_DIR=a52 #A52_DIR=a52
else #else
A52_DIR= #A52_DIR=
endif #endif
if USE_AALIB if USE_AALIB
AALIB_DIR=aalib AALIB_DIR=aalib
@ -52,9 +52,10 @@ else
VORBIS_DIR= VORBIS_DIR=
endif endif
#$A52_DIR
SUBDIRS=$(A52_DIR) $(AALIB_DIR) $(ALSA_DIR) $(AUDIOFILE_DIR) $(ESD_DIR) \ SUBDIRS=$(AALIB_DIR) $(ALSA_DIR) $(AUDIOFILE_DIR) $(ESD_DIR) \
$(LAME_DIR) $(MAD_DIR) \ $(LAME_DIR) $(MAD_DIR) \
$(SDL_DIR) $(VORBIS_DIR) $(SDL_DIR) $(VORBIS_DIR)
DIST_SUBDIRS=a52 aalib alsa audiofile esd lame mad sdl vorbis #a52
DIST_SUBDIRS=aalib alsa audiofile esd lame mad sdl vorbis

View file

@ -3,6 +3,7 @@ filterdir = $(libdir)/gst
filter_LTLIBRARIES = libgstcutter.la filter_LTLIBRARIES = libgstcutter.la
libgstcutter_la_SOURCES = gstcutter.c libgstcutter_la_SOURCES = gstcutter.c
libgstcutter_la_CFLAGS = $(GST_CFLAGS)
noinst_HEADERS = gstcutter.h filter.func noinst_HEADERS = gstcutter.h filter.func

View file

@ -18,8 +18,8 @@
*/ */
#include <gst/gst.h> #include <gst/gst.h>
#include <libs/audio/gstaudio.h> #include <gst/audio/audio.h>
#include "cutter.h" #include "gstcutter.h"
#include "math.h" #include "math.h"