Commit 7e89cbf5 authored by David Schleef's avatar David Schleef
Browse files

gst/Makefile.am: Remove as-libtool stuff. It's likely not and hard to carry around.

Original commit message from CVS:
* gst/Makefile.am: Remove as-libtool stuff.  It's likely not
needed with new versions of libtool (nobody will confirm this),
and hard to carry around.
* gst/autoplug/Makefile.am:
* gst/base/Makefile.am:
* gst/elements/Makefile.am:
* gst/indexers/Makefile.am:
* gst/schedulers/Makefile.am:
* libs/gst/bytestream/Makefile.am:
* libs/gst/control/Makefile.am:
* libs/gst/dataprotocol/Makefile.am:
* libs/gst/getbits/Makefile.am:
parent 07340c4e
2005-04-23 David Schleef <ds@schleef.org>
* gst/Makefile.am: Remove as-libtool stuff. It's likely not
needed with new versions of libtool (nobody will confirm this),
and hard to carry around.
* gst/autoplug/Makefile.am:
* gst/base/Makefile.am:
* gst/elements/Makefile.am:
* gst/indexers/Makefile.am:
* gst/schedulers/Makefile.am:
* libs/gst/bytestream/Makefile.am:
* libs/gst/control/Makefile.am:
* libs/gst/dataprotocol/Makefile.am:
* libs/gst/getbits/Makefile.am:
2005-04-21 Wim Taymans <wim@fluendo.com>
* docs/design/draft-push-pull.txt:
......
lib_LTLIBRARIES = libgstreamer-@GST_MAJORMINOR@.la
AS_LIBTOOL_LIB = libgstreamer-@GST_MAJORMINOR@
noinst_LTLIBRARIES =
#GST_INSTRUMENT_FLAGS = -finstrument-functions -DGST_ENABLE_FUNC_INSTRUMENTATION
......@@ -145,8 +144,7 @@ libgstreamer_@GST_MAJORMINOR@_la_LIBADD = \
$(GST_LIB_LIBS) $(GST_PARSE_LIBADD) $(GST_REGISTRY_LIBADD)
libgstreamer_@GST_MAJORMINOR@_la_LDFLAGS = \
@GST_LT_LDFLAGS@ -version-info @GST_LIBVERSION@ \
-export-symbols-regex [_]*\(gst_\|Gst\|GST_\).* \
$(as_libtool_LDFLAGS)
-export-symbols-regex [_]*\(gst_\|Gst\|GST_\).*
libgstreamer_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst
......@@ -241,13 +239,5 @@ gstenumtypes.c: $(gst_headers)
--vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \
$^ > gstenumtypes.c
noinst_DATA = $(as_libtool_noinst_DATA_files)
EXTRA_DIST = ROADMAP $(as_libtool_EXTRA_DIST)
install-data-local: as-libtool-install-data-local
uninstall-local: as-libtool-uninstall-local
include $(top_srcdir)/common/as-libtool.mak
EXTRA_DIST = ROADMAP
plugin_LTLIBRARIES = libgstspider.la
AS_LIBTOOL_LIB = libgstspider
EXTRA_DIST = $(as_libtool_EXTRA_DIST)
noinst_DATA = $(as_libtool_noinst_DATA_files)
libgstspider_la_SOURCES = \
gstspider.c gstspideridentity.c \
gstsearchfuncs.c
libgstspider_la_CFLAGS = $(GST_OBJ_CFLAGS)
libgstspider_la_LIBADD = $(GST_OBJ_LIBS)
libgstspider_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(as_libtool_LDFLAGS)
libgstspider_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstspider.h gstspideridentity.h gstsearchfuncs.h
......@@ -20,9 +16,3 @@ spidertest_SOURCES = spidertest.c
spidertest_CFLAGS = $(GST_OBJ_CFLAGS)
spidertest_LDADD = $(GST_OBJ_LIBS)
install-data-local: as-libtool-install-data-local
uninstall-local: as-libtool-uninstall-local
include $(top_srcdir)/common/as-libtool.mak
lib_LTLIBRARIES = libgstbase-@GST_MAJORMINOR@.la
AS_LIBTOOL_LIB = libgstbase-@GST_MAJORMINOR@
EXTRA_DIST = $(as_libtool_EXTRA_DIST)
noinst_DATA = $(as_libtool_noinst_DATA_files)
libgstbase_@GST_MAJORMINOR@_la_DEPENDENCIES = \
../libgstreamer-@GST_MAJORMINOR@.la
......@@ -15,7 +11,7 @@ libgstbase_@GST_MAJORMINOR@_la_SOURCES = \
libgstbase_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS)
libgstbase_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) \
../libgstreamer-@GST_MAJORMINOR@.la
libgstbase_@GST_MAJORMINOR@_la_LDFLAGS = $(as_libtool_LDFLAGS)
libgstbase_@GST_MAJORMINOR@_la_LDFLAGS =
libgstbase_@GST_MAJORMINOR@includedir = \
$(includedir)/gstreamer-@GST_MAJORMINOR@/gst/base
......@@ -26,9 +22,3 @@ libgstbase_@GST_MAJORMINOR@include_HEADERS = \
gstbasetransform.h \
gsttypefindhelper.h
install-data-local: as-libtool-install-data-local
uninstall-local: as-libtool-uninstall-local
include $(top_srcdir)/common/as-libtool.mak
......@@ -5,22 +5,9 @@
# do.
plugin_LTLIBRARIES = libgstelements.la
AS_LIBTOOL_LIB = libgstelements
EXTRA_DIST = $(as_libtool_EXTRA_DIST)
noinst_DATA = $(as_libtool_noinst_DATA_files)
# FIXME:
# Disable multifilesrc on Windows, cause it uses mmap excessively
# and I don't feel like fixing it yet. See also the disablement
# in gstelements.c.
if AS_LIBTOOL_WIN32
multifilesrc =
pipefilter =
else
multifilesrc = gstmultifilesrc.c
pipefilter = gstpipefilter.c
endif
libgstelements_la_DEPENDENCIES = ../libgstreamer-@GST_MAJORMINOR@.la
libgstelements_la_SOURCES = \
......@@ -36,7 +23,7 @@ libgstelements_la_SOURCES = \
# FIXME 0.9: mentioned by po/POTFILES.in, so we include them here --
# this is a short-term hack, really we should just decide the fate of
# these files above, then this will be unnecessary
EXTRA_DIST += \
EXTRA_DIST = \
gstaggregator.c \
gstfilesink.c \
gstfdsink.c \
......@@ -52,7 +39,7 @@ libgstelements_la_CFLAGS = $(GST_OBJ_CFLAGS)
libgstelements_la_LIBADD = $(GST_OBJ_LIBS) \
$(top_builddir)/gst/base/libgstbase-@GST_MAJORMINOR@.la \
$(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la
libgstelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(as_libtool_LDFLAGS)
libgstelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = \
gstaggregator.h \
......@@ -72,9 +59,3 @@ noinst_HEADERS = \
gsttee.h \
gsttypefindelement.h
install-data-local: as-libtool-install-data-local
uninstall-local: as-libtool-uninstall-local
include $(top_srcdir)/common/as-libtool.mak
plugin_LTLIBRARIES = libgstindexers.la
AS_LIBTOOL_LIB = libgstindexers
EXTRA_DIST = $(as_libtool_EXTRA_DIST)
noinst_DATA = $(as_libtool_noinst_DATA_files)
# file index uses xml
if GST_DISABLE_LOADSAVE
......@@ -15,11 +11,5 @@ endif
libgstindexers_la_SOURCES = gstindexers.c gstmemindex.c $(GST_LOADSAVE_SRC)
libgstindexers_la_CFLAGS = $(GST_OBJ_CFLAGS)
libgstindexers_la_LIBADD = $(GST_OBJ_LIBS)
libgstindexers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(as_libtool_LDFLAGS)
install-data-local: as-libtool-install-data-local
uninstall-local: as-libtool-uninstall-local
include $(top_srcdir)/common/as-libtool.mak
libgstindexers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
plugin_LTLIBRARIES = \
libthreadscheduler.la
AS_LIBTOOL_LIBS = \
libthreadscheduler
libthreadscheduler_la_SOURCES = threadscheduler.c
libthreadscheduler_la_CFLAGS = $(GST_OBJ_CFLAGS)
......@@ -11,42 +9,3 @@ libthreadscheduler_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS =
if AS_LIBTOOL_WIN32
as_libtool_noinst_DATA_files = $(AS_LIBTOOL_LIB).lib
as_libtool_LDFLAGS = -no-undefined
# depend on this in install-data-local
as-libtool-install-data-local:
for i in $(AS_LIBTOOL_LIBS); do \
$(INSTALL) $$i.lib $(DESTDIR)$(libdir) ; \
$(INSTALL) $$i.def $(DESTDIR)$(libdir) ; \
done
# depend on this in uninstall-local
as-libtool-uninstall-local:
for i in $(AS_LIBTOOL_LIBS); do \
-rm $(DESTDIR)$(libdir)/$$i.lib ; \
-rm $(DESTDIR)$(libdir)/$$i.def ; \
done
else
as_libtool_LDFLAGS =
as-libtool-install-data-local:
as-libtool-uninstall-local:
endif
%.lib: %.def
dlltool -S $(CC) -f "-c" --export-all-symbols --input-def \
%.def --output-lib %.lib
%.def: %.la
echo EXPORTS >%.def.tmp
nm --defined-only -g .libs/%.a | \
grep ^0 | \
awk '{ print $$3 }' | \
sed 's/^/ /' >>%.def.tmp
mv %.def.tmp %.def
lib_LTLIBRARIES = libgstbase-@GST_MAJORMINOR@.la
AS_LIBTOOL_LIB = libgstbase-@GST_MAJORMINOR@
EXTRA_DIST = $(as_libtool_EXTRA_DIST)
noinst_DATA = $(as_libtool_noinst_DATA_files)
libgstbase_@GST_MAJORMINOR@_la_DEPENDENCIES = \
../libgstreamer-@GST_MAJORMINOR@.la
......@@ -15,7 +11,7 @@ libgstbase_@GST_MAJORMINOR@_la_SOURCES = \
libgstbase_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS)
libgstbase_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) \
../libgstreamer-@GST_MAJORMINOR@.la
libgstbase_@GST_MAJORMINOR@_la_LDFLAGS = $(as_libtool_LDFLAGS)
libgstbase_@GST_MAJORMINOR@_la_LDFLAGS =
libgstbase_@GST_MAJORMINOR@includedir = \
$(includedir)/gstreamer-@GST_MAJORMINOR@/gst/base
......@@ -26,9 +22,3 @@ libgstbase_@GST_MAJORMINOR@include_HEADERS = \
gstbasetransform.h \
gsttypefindhelper.h
install-data-local: as-libtool-install-data-local
uninstall-local: as-libtool-uninstall-local
include $(top_srcdir)/common/as-libtool.mak
plugin_LTLIBRARIES = libgstbytestream.la
AS_LIBTOOL_LIB = libgstbytestream
EXTRA_DIST = $(as_libtool_EXTRA_DIST)
noinst_DATA = $(as_libtool_noinst_DATA_files)
libgstbytestreamincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/bytestream
libgstbytestreaminclude_HEADERS = bytestream.h adapter.h filepad.h
......@@ -10,10 +6,5 @@ libgstbytestreaminclude_HEADERS = bytestream.h adapter.h filepad.h
libgstbytestream_la_SOURCES = bytestream.c adapter.c filepad.c
libgstbytestream_la_CFLAGS = $(GST_OBJ_CFLAGS)
libgstbytestream_la_LIBS = $(GST_OBJ_LIBS)
libgstbytestream_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(as_libtool_LDFLAGS)
install-data-local: as-libtool-install-data-local
uninstall-local: as-libtool-uninstall-local
libgstbytestream_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
include $(top_srcdir)/common/as-libtool.mak
lib_LTLIBRARIES = libgstcontrol-@GST_MAJORMINOR@.la
AS_LIBTOOL_LIB = libgstcontrol-@GST_MAJORMINOR@
EXTRA_DIST = $(as_libtool_EXTRA_DIST)
noinst_DATA = $(as_libtool_noinst_DATA_files)
libgstcontrol_@GST_MAJORMINOR@_includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/control
libgstcontrol_@GST_MAJORMINOR@_include_HEADERS = \
......@@ -23,12 +19,7 @@ libgstcontrol_@GST_MAJORMINOR@_la_SOURCES = \
dplinearinterp.c
libgstcontrol_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) -I$(top_srcdir)/libs
libgstcontrol_@GST_MAJORMINOR@_la_LDFLAGS = @GST_LIB_LDFLAGS@ $(as_libtool_LDFLAGS)
libgstcontrol_@GST_MAJORMINOR@_la_LDFLAGS = @GST_LIB_LDFLAGS@
# control uses log and exp, so we need -lm if xml is disabled
libgstcontrol_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) -lm
install-data-local: as-libtool-install-data-local
uninstall-local: as-libtool-uninstall-local
include $(top_srcdir)/common/as-libtool.mak
plugin_LTLIBRARIES = libgstdataprotocol.la
AS_LIBTOOL_LIB = libgstdataprotocol
EXTRA_DIST = $(as_libtool_EXTRA_DIST)
noinst_DATA = $(as_libtool_noinst_DATA_files)
libgstdataprotocol_includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/dataprotocol
libgstdataprotocol_include_HEADERS = \
......@@ -14,11 +10,6 @@ libgstdataprotocol_la_SOURCES = \
# remove GST_ENABLE_NEW when dataprotocol has been declared API-stable
libgstdataprotocol_la_CFLAGS = $(GST_OBJ_CFLAGS) -I$(top_srcdir)/libs -DGST_ENABLE_NEW
libgstdataprotocol_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(as_libtool_LDFLAGS)
libgstdataprotocol_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstdataprotocol_la_LIBADD = $(GST_OBJ_LIBS)
install-data-local: as-libtool-install-data-local
uninstall-local: as-libtool-uninstall-local
include $(top_srcdir)/common/as-libtool.mak
plugin_LTLIBRARIES = libgstgetbits.la
AS_LIBTOOL_LIB = libgstgetbits
EXTRA_DIST = $(as_libtool_EXTRA_DIST)
noinst_DATA = $(as_libtool_noinst_DATA_files)
if HAVE_CPU_I386
GSTARCH_SRCS = gstgetbits_i386.s
......@@ -18,12 +14,7 @@ libgstgetbits_la_SOURCES = getbits.c gstgetbits_inl.h gstgetbits_generic.c $(GST
EXTRA_libgstgetbits_la_SOURCES = gstgetbits_i386.s
libgstgetbits_la_CFLAGS = $(GST_OBJ_CFLAGS) -funroll-all-loops -finline-functions -ffast-math
libgstgetbits_la_LDFLAGS = $(GST_OBJ_LIBS) $(GST_PLUGIN_LDFLAGS) $(as_libtool_LDFLAGS)
libgstgetbits_la_LDFLAGS = $(GST_OBJ_LIBS) $(GST_PLUGIN_LDFLAGS)
# check_PROGRAMS = gbtest
install-data-local: as-libtool-install-data-local
uninstall-local: as-libtool-uninstall-local
include $(top_srcdir)/common/as-libtool.mak
......@@ -5,22 +5,9 @@
# do.
plugin_LTLIBRARIES = libgstelements.la
AS_LIBTOOL_LIB = libgstelements
EXTRA_DIST = $(as_libtool_EXTRA_DIST)
noinst_DATA = $(as_libtool_noinst_DATA_files)
# FIXME:
# Disable multifilesrc on Windows, cause it uses mmap excessively
# and I don't feel like fixing it yet. See also the disablement
# in gstelements.c.
if AS_LIBTOOL_WIN32
multifilesrc =
pipefilter =
else
multifilesrc = gstmultifilesrc.c
pipefilter = gstpipefilter.c
endif
libgstelements_la_DEPENDENCIES = ../libgstreamer-@GST_MAJORMINOR@.la
libgstelements_la_SOURCES = \
......@@ -36,7 +23,7 @@ libgstelements_la_SOURCES = \
# FIXME 0.9: mentioned by po/POTFILES.in, so we include them here --
# this is a short-term hack, really we should just decide the fate of
# these files above, then this will be unnecessary
EXTRA_DIST += \
EXTRA_DIST = \
gstaggregator.c \
gstfilesink.c \
gstfdsink.c \
......@@ -52,7 +39,7 @@ libgstelements_la_CFLAGS = $(GST_OBJ_CFLAGS)
libgstelements_la_LIBADD = $(GST_OBJ_LIBS) \
$(top_builddir)/gst/base/libgstbase-@GST_MAJORMINOR@.la \
$(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la
libgstelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(as_libtool_LDFLAGS)
libgstelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = \
gstaggregator.h \
......@@ -72,9 +59,3 @@ noinst_HEADERS = \
gsttee.h \
gsttypefindelement.h
install-data-local: as-libtool-install-data-local
uninstall-local: as-libtool-uninstall-local
include $(top_srcdir)/common/as-libtool.mak
plugin_LTLIBRARIES = libgstindexers.la
AS_LIBTOOL_LIB = libgstindexers
EXTRA_DIST = $(as_libtool_EXTRA_DIST)
noinst_DATA = $(as_libtool_noinst_DATA_files)
# file index uses xml
if GST_DISABLE_LOADSAVE
......@@ -15,11 +11,5 @@ endif
libgstindexers_la_SOURCES = gstindexers.c gstmemindex.c $(GST_LOADSAVE_SRC)
libgstindexers_la_CFLAGS = $(GST_OBJ_CFLAGS)
libgstindexers_la_LIBADD = $(GST_OBJ_LIBS)
libgstindexers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(as_libtool_LDFLAGS)
install-data-local: as-libtool-install-data-local
uninstall-local: as-libtool-uninstall-local
include $(top_srcdir)/common/as-libtool.mak
libgstindexers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment