summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2003-04-05 21:28:34 +0000
committerDavid Schleef <ds@schleef.org>2003-04-05 21:28:34 +0000
commit6b32ca5b1a9e4e715dbcb17416f97f9c0a592146 (patch)
treed758af635a96db2cff41c97fd53264f6c0499856
parent40fbee86ff63f8b62f6ce49e44388aceb1b913cc (diff)
downloadgst-plugins-bad-6b32ca5b1a9e4e715dbcb17416f97f9c0a592146.tar.gz
gst-plugins-bad-6b32ca5b1a9e4e715dbcb17416f97f9c0a592146.tar.bz2
gst-plugins-bad-6b32ca5b1a9e4e715dbcb17416f97f9c0a592146.zip
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.
-rw-r--r--ext/arts/Makefile.am16
1 files changed, 1 insertions, 15 deletions
diff --git a/ext/arts/Makefile.am b/ext/arts/Makefile.am
index 1e6922a6..f83c285c 100644
--- a/ext/arts/Makefile.am
+++ b/ext/arts/Makefile.am
@@ -2,12 +2,6 @@ plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
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
.idl.cc:
mcopidl -t $(ARTS_CXXFLAGS) $<
@@ -15,20 +9,12 @@ SUFFIXES = .idl
# mcopidl Extension Expansion Technology clean up
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
-# _SOURCES at which point the follow can be removed
-
-libgstarts_la_SOURCES = gst_arts.c gst_artsio.cc gst_artsio_impl.cc
+libgstarts_la_SOURCES = gst_arts.c gst_artsio.idl gst_artsio_impl.cc
libgstarts_la_CFLAGS = $(GST_CFLAGS)
libgstarts_la_CXXFLAGS = $(ARTS_CXXFLAGS) $(GST_CFLAGS)
libgstarts_la_LIBADD = $(ARTS_LIBS) -lartsflow -lartsflow_idl
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
dist-hook: