summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2002-01-04 11:17:37 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2002-01-04 11:17:37 +0000
commit598433069d73f1fc9ab3f8826f3bc2b98a12dbe9 (patch)
tree9b4fa8c668ecdf336e88f59a6d377bb8488eedfb
parentd719d0907644b76aa0e0669cac65dceb8c6361a7 (diff)
downloadgst-plugins-bad-598433069d73f1fc9ab3f8826f3bc2b98a12dbe9.tar.gz
gst-plugins-bad-598433069d73f1fc9ab3f8826f3bc2b98a12dbe9.tar.bz2
gst-plugins-bad-598433069d73f1fc9ab3f8826f3bc2b98a12dbe9.zip
more fixing
Original commit message from CVS: more fixing
-rw-r--r--ext/arts/Makefile.am27
1 files changed, 16 insertions, 11 deletions
diff --git a/ext/arts/Makefile.am b/ext/arts/Makefile.am
index a18ea8f0..fedad88c 100644
--- a/ext/arts/Makefile.am
+++ b/ext/arts/Makefile.am
@@ -1,5 +1,12 @@
-## we wrap this Makefile.am in a USE_ so that we won't run mcopidl
-## during make distcheck when it isn't on the system
+plugindir = $(libdir)/gst
+
+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:
@@ -7,25 +14,23 @@ SUFFIXES = .idl
# mcopidl Extension Expansion Technology clean up
CLEANFILES = gst_artsio.h gst_artsio.cc gst_artsio.mcopclass gst_artsio.mcoptype
-endif
-plugindir = $(libdir)/gst
-
-plugin_LTLIBRARIES = libgstarts.la
-
-gst_artsio_impl.lo: gst_artsio.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
# _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_CXXFLAGS = $(ARTS_CXXFLAGS) $(GST_CFLAGS)
libgstarts_la_LIBADD = $(ARTS_LIBS)
EXTRA_DIST = gst_artsio.idl
+else
+EXTRA_DIST = gst_arts.c gst_artsio.cc gst_artsio_impl.cc
+endif
+
+noinst_HEADERS = gst_arts.h gst_artsio_impl.h
+
dist-hook:
rm -f $(distdir)/gst_artsio.cc