Various fixes that collectively allow make dist to work.

Original commit message from CVS:
Various fixes that collectively allow `make dist` to work.
This commit is contained in:
Erik Walthinsen 2000-01-31 05:55:22 +00:00
parent 3ada045e2e
commit 0bc672ec72
7 changed files with 15 additions and 12 deletions

1
.gitignore vendored
View file

@ -8,6 +8,7 @@ config.log
config.status config.status
config.sub config.sub
configure configure
gstreamer-[0-9]*
gstreamer-config gstreamer-config
gstreamer.spec gstreamer.spec
libtool libtool

View file

@ -6,6 +6,7 @@
#undef HAVE_LIBXML #undef HAVE_LIBXML
#undef HAVE_LIBMMX #undef HAVE_LIBMMX
#undef HAVE_XAUDIO #undef HAVE_XAUDIO
#undef HAVE_CSSAUTH
#undef HAVE_ATOMIC_H #undef HAVE_ATOMIC_H

View file

@ -14,6 +14,7 @@
#undef HAVE_LIBXML #undef HAVE_LIBXML
#undef HAVE_LIBMMX #undef HAVE_LIBMMX
#undef HAVE_XAUDIO #undef HAVE_XAUDIO
#undef HAVE_CSSAUTH
#undef HAVE_ATOMIC_H #undef HAVE_ATOMIC_H

View file

@ -66,14 +66,10 @@ AM_CONDITIONAL(HAVE_LIBXML, test "x$HAVE_LIBXML" = "xyes")
AC_CHECK_HEADER(mmx.h,[ AC_CHECK_HEADER(mmx.h,[
AC_DEFINE(HAVE_LIBMMX), []]) AC_DEFINE(HAVE_LIBMMX)
AM_CONDITIONAL(HAVE_LIBMMX, test "x$HAVE_LIBMMX" = "xyes") HAVE_LIBMMX="yes", []
AC_CHECK_HEADER(xaudio/decoder.h,[
AC_DEFINE(HAVE_XAUDIO)
HAVE_XAUDIO="yes", []
]) ])
AM_CONDITIONAL(HAVE_XAUDIO, test "x$HAVE_XAUDIO" = "xyes") AM_CONDITIONAL(HAVE_LIBMMX, test "x$HAVE_LIBMMX" = "xyes")
AC_CHECK_HEADER(xaudio/decoder.h,[ AC_CHECK_HEADER(xaudio/decoder.h,[
AC_DEFINE(HAVE_XAUDIO) AC_DEFINE(HAVE_XAUDIO)
@ -109,12 +105,12 @@ dnl check if css.c exists (FIXME)
if test -f plugins/dvdsrc/css.c if test -f plugins/dvdsrc/css.c
then then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
HAVE_DECSS="yes" HAVE_CSSAUTH="yes"
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
HAVE_DECSS="no" HAVE_CSSAUTH="no"
fi fi
AM_CONDITIONAL(HAVE_DECSS, test "x$HAVE_DECSS" = "xyes") AM_CONDITIONAL(HAVE_CSSAUTH, test "x$HAVE_CSSAUTH" = "xyes")
AC_SUBST(CFLAGS) AC_SUBST(CFLAGS)

View file

@ -2,7 +2,7 @@
bin_PROGRAMS = qtest spectrum record wave mp3 teardown buffer mp3parse \ bin_PROGRAMS = qtest spectrum record wave mp3 teardown buffer mp3parse \
mpeg2parse mp3play ac3parse ac3play dvdcat fake cobin mpeg2parse mp3play ac3parse ac3play dvdcat fake cobin
SUBDIRS = xml cothreads SUBDIRS = xml cothreads bindings
spectrum_CFLAGS = $(shell gnome-config --cflags gnomeui) spectrum_CFLAGS = $(shell gnome-config --cflags gnomeui)
spectrum_LDFLAGS = $(shell gnome-config --libs gnomeui) spectrum_LDFLAGS = $(shell gnome-config --libs gnomeui)
@ -13,6 +13,8 @@ buffer_SOURCES = buffer.c mem.c
teardown_SOURCES = teardown.c mem.c teardown_SOURCES = teardown.c mem.c
ac3play_SOURCES = ac3play.c mem.c ac3play_SOURCES = ac3play.c mem.c
noinst_HEADERS = mem.h
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir) \ INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir) \

View file

@ -3,3 +3,5 @@ bin_PROGRAMS = test simple
test_SOURCES = test.c cothreads.c object.c looper.c test_SOURCES = test.c cothreads.c object.c looper.c
simple_SOURCES = simple.c cothreads.c simple_SOURCES = simple.c cothreads.c
noinst_HEADERS = cothreads.h object.h looper.h

View file

@ -3,4 +3,4 @@ bin_PROGRAMS = readreg createreg
INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) -I$(top_srcdir) INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) -I$(top_srcdir)
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(XML_LIBS) $(top_srcdir)/gst/libgst.la LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(XML_LIBS) $(top_srcdir)/gst/libgst.la
EXTRA_DIST = README registry.xml EXTRA_DIST = README