mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-06-06 23:48:53 +00:00
Remove automake-1.4 hack to get files to dist correctly. Fixes #104689.
Original commit message from CVS: Remove automake-1.4 hack to get files to dist correctly. Fixes #104689. Doesn't need to go into 0.6.1, imo.
This commit is contained in:
parent
40fbee86ff
commit
6b32ca5b1a
1 changed files with 1 additions and 15 deletions
|
@ -2,12 +2,6 @@ plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
|
||||||
|
|
||||||
plugin_LTLIBRARIES = libgstarts.la
|
plugin_LTLIBRARIES = libgstarts.la
|
||||||
|
|
||||||
gst_artsio_impl.lo: gst_artsio.cc
|
|
||||||
|
|
||||||
## we wrap parts of this Makefile.am in a USE_ so that we won't run
|
|
||||||
## mcopidl during make distcheck when it isn't on the system
|
|
||||||
|
|
||||||
if USE_ARTS
|
|
||||||
SUFFIXES = .idl
|
SUFFIXES = .idl
|
||||||
.idl.cc:
|
.idl.cc:
|
||||||
mcopidl -t $(ARTS_CXXFLAGS) $<
|
mcopidl -t $(ARTS_CXXFLAGS) $<
|
||||||
|
@ -15,20 +9,12 @@ SUFFIXES = .idl
|
||||||
# mcopidl Extension Expansion Technology clean up
|
# mcopidl Extension Expansion Technology clean up
|
||||||
CLEANFILES = gst_artsio.h gst_artsio.cc gst_artsio.mcopclass gst_artsio.mcoptype
|
CLEANFILES = gst_artsio.h gst_artsio.cc gst_artsio.mcopclass gst_artsio.mcoptype
|
||||||
|
|
||||||
# FIXME automake 1.4 hack, 1.5 should let us put the .idl in
|
libgstarts_la_SOURCES = gst_arts.c gst_artsio.idl gst_artsio_impl.cc
|
||||||
# _SOURCES at which point the follow can be removed
|
|
||||||
|
|
||||||
libgstarts_la_SOURCES = gst_arts.c gst_artsio.cc gst_artsio_impl.cc
|
|
||||||
libgstarts_la_CFLAGS = $(GST_CFLAGS)
|
libgstarts_la_CFLAGS = $(GST_CFLAGS)
|
||||||
libgstarts_la_CXXFLAGS = $(ARTS_CXXFLAGS) $(GST_CFLAGS)
|
libgstarts_la_CXXFLAGS = $(ARTS_CXXFLAGS) $(GST_CFLAGS)
|
||||||
libgstarts_la_LIBADD = $(ARTS_LIBS) -lartsflow -lartsflow_idl
|
libgstarts_la_LIBADD = $(ARTS_LIBS) -lartsflow -lartsflow_idl
|
||||||
libgstarts_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
libgstarts_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||||
|
|
||||||
EXTRA_DIST = gst_artsio.idl
|
|
||||||
else
|
|
||||||
EXTRA_DIST = gst_arts.c gst_artsio.idl gst_artsio_impl.cc
|
|
||||||
endif
|
|
||||||
|
|
||||||
noinst_HEADERS = gst_arts.h gst_artsio_impl.h
|
noinst_HEADERS = gst_arts.h gst_artsio_impl.h
|
||||||
|
|
||||||
dist-hook:
|
dist-hook:
|
||||||
|
|
Loading…
Reference in a new issue