trim fat from nonversioned binaries

Original commit message from CVS:
trim fat from nonversioned binaries
This commit is contained in:
Thomas Vander Stichele 2004-03-02 10:38:40 +00:00
parent 4e298c0641
commit 1c6814ff53
3 changed files with 38 additions and 6 deletions

View file

@ -1,3 +1,10 @@
2004-03-02 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac:
get GLIB_ONLY and POPT flags for the nonversioned binaries
* tools/Makefile.am:
use them
2004-03-02 Thomas Vander Stichele <thomas at apestaart dot org> 2004-03-02 Thomas Vander Stichele <thomas at apestaart dot org>
* gst/gst.c: (init_post): * gst/gst.c: (init_post):

View file

@ -23,7 +23,9 @@ dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0
dnl - interfaces added -> increment AGE dnl - interfaces added -> increment AGE
dnl - interfaces removed -> AGE = 0 dnl - interfaces removed -> AGE = 0
AS_LIBTOOL(GST, 7, 0, 1) AS_LIBTOOL(GST, 7, 0, 1)
echo libtool
AM_PROG_LIBTOOL AM_PROG_LIBTOOL
echo libtool done
AC_CONFIG_SRCDIR([gst/gst.c]) AC_CONFIG_SRCDIR([gst/gst.c])
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
@ -35,6 +37,7 @@ AM_PROG_CC_STDC
AM_PROG_AS AM_PROG_AS
AS="${CC}" AS="${CC}"
echo gettext
dnl the gettext stuff needed dnl the gettext stuff needed
AM_GNU_GETTEXT_VERSION(0.11.5) AM_GNU_GETTEXT_VERSION(0.11.5)
AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT([external])
@ -212,7 +215,7 @@ dnl required for compilation without warnings
GLIB2_REQ="2.2" GLIB2_REQ="2.2"
AC_SUBST(GLIB2_REQ) AC_SUBST(GLIB2_REQ)
dnl Check for glib2 dnl Check for glib2 with sugar on top
PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_REQ gobject-2.0 gthread-2.0 gmodule-2.0,HAVE_GLIB2=yes,HAVE_GLIB2=no) PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_REQ gobject-2.0 gthread-2.0 gmodule-2.0,HAVE_GLIB2=yes,HAVE_GLIB2=no)
GLIB_LIBS=$GLIB2_LIBS GLIB_LIBS=$GLIB2_LIBS
GLIB_CFLAGS=$GLIB2_CFLAGS GLIB_CFLAGS=$GLIB2_CFLAGS
@ -226,6 +229,9 @@ fi
GST_PKG_DEPS="glib-2.0, gobject-2.0, gmodule-2.0, gthread-2.0" GST_PKG_DEPS="glib-2.0, gobject-2.0, gmodule-2.0, gthread-2.0"
AC_SUBST(GST_PKG_DEPS) AC_SUBST(GST_PKG_DEPS)
dnl Check for glib2 without extra fat, useful for the unversioned tool frontends
PKG_CHECK_MODULES(GLIB_ONLY, glib-2.0 >= $GLIB2_REQ)
dnl === libxml 2 === dnl === libxml 2 ===
if test "x$GST_DISABLE_LOADSAVE" = "xyes" && test "x$GST_DISABLE_REGISTRY" = "xyes" if test "x$GST_DISABLE_LOADSAVE" = "xyes" && test "x$GST_DISABLE_REGISTRY" = "xyes"
then then
@ -260,6 +266,7 @@ int main ()
download the latest version from download the latest version from
ftp://ftp.rpm.org/pub/rpm/dist/]) ftp://ftp.rpm.org/pub/rpm/dist/])
]) ])
AC_SUBST(POPT_LIBS)
dnl Check for atomic.h dnl Check for atomic.h
dnl Note: use AC_CHECK_HEADER not AC_CHECK_HEADERS, because the latter dnl Note: use AC_CHECK_HEADER not AC_CHECK_HEADERS, because the latter

View file

@ -39,20 +39,38 @@ bin_PROGRAMS = \
$(GST_OTHER_SRC) $(GST_OTHER_SRC_V) $(GST_OTHER_SRC) $(GST_OTHER_SRC_V)
bin_SCRIPTS = gst-feedback-@GST_MAJORMINOR@ bin_SCRIPTS = gst-feedback-@GST_MAJORMINOR@
# make sure each versioned tool has the right source file # make sure each versioned tool has the right source file and flags
if !GST_DISABLE_REGISTRY if !GST_DISABLE_REGISTRY
gst_register_@GST_MAJORMINOR@_SOURCES = gst-register.c gst_register_@GST_MAJORMINOR@_SOURCES = gst-register.c
gst_register_@GST_MAJORMINOR@_CFLAGS = $(GST_CFLAGS)
gst_register_@GST_MAJORMINOR@_LDFLAGS = $(GST_LIBS)
endif endif
if !GST_DISABLE_LOADSAVE if !GST_DISABLE_LOADSAVE
gst_complete_@GST_MAJORMINOR@_SOURCES = gst-complete.c gst_complete_@GST_MAJORMINOR@_SOURCES = gst-complete.c
gst_complete_@GST_MAJORMINOR@_CFLAGS = $(GST_CFLAGS)
gst_complete_@GST_MAJORMINOR@_LDFLAGS = $(GST_LIBS)
gst_compprep_@GST_MAJORMINOR@_SOURCES = gst-compprep.c gst_compprep_@GST_MAJORMINOR@_SOURCES = gst-compprep.c
gst_compprep_@GST_MAJORMINOR@_CFLAGS = $(GST_CFLAGS)
gst_compprep_@GST_MAJORMINOR@_LDFLAGS = $(GST_LIBS)
gst_xmllaunch_@GST_MAJORMINOR@_SOURCES = gst-launch.c gst_xmllaunch_@GST_MAJORMINOR@_SOURCES = gst-launch.c
gst_xmllaunch_@GST_MAJORMINOR@_CFLAGS = $(GST_CFLAGS)
gst_xmllaunch_@GST_MAJORMINOR@_LDFLAGS = $(GST_LIBS)
endif endif
gst_inspect_@GST_MAJORMINOR@_SOURCES = gst-inspect.c gst_inspect_@GST_MAJORMINOR@_SOURCES = gst-inspect.c
gst_inspect_@GST_MAJORMINOR@_CFLAGS = $(GST_CFLAGS)
gst_inspect_@GST_MAJORMINOR@_LDFLAGS = $(GST_LIBS)
gst_launch_@GST_MAJORMINOR@_SOURCES = gst-launch.c gst_launch_@GST_MAJORMINOR@_SOURCES = gst-launch.c
gst_launch_@GST_MAJORMINOR@_CFLAGS = $(GST_CFLAGS)
gst_launch_@GST_MAJORMINOR@_LDFLAGS = $(GST_LIBS)
gst_md5sum_@GST_MAJORMINOR@_SOURCES = gst-md5sum.c gst_md5sum_@GST_MAJORMINOR@_SOURCES = gst-md5sum.c
gst_md5sum_@GST_MAJORMINOR@_CFLAGS = $(GST_CFLAGS)
gst_md5sum_@GST_MAJORMINOR@_LDFLAGS = $(GST_LIBS)
gst_typefind_@GST_MAJORMINOR@_SOURCES = gst-typefind.c gst_typefind_@GST_MAJORMINOR@_SOURCES = gst-typefind.c
gst_typefind_@GST_MAJORMINOR@_CFLAGS = $(GST_CFLAGS)
gst_typefind_@GST_MAJORMINOR@_LDFLAGS = $(GST_LIBS)
gst_xmlinspect_@GST_MAJORMINOR@_SOURCES = gst-xmlinspect.c gst_xmlinspect_@GST_MAJORMINOR@_SOURCES = gst-xmlinspect.c
gst_xmlinspect_@GST_MAJORMINOR@_CFLAGS = $(GST_CFLAGS)
gst_xmlinspect_@GST_MAJORMINOR@_LDFLAGS = $(GST_LIBS)
# make sure each unversioned tool comes from gst-run.c # make sure each unversioned tool comes from gst-run.c
if !GST_DISABLE_REGISTRY if !GST_DISABLE_REGISTRY
@ -70,14 +88,14 @@ gst_md5sum_SOURCES = gst-run.c
gst_typefind_SOURCES = gst-run.c gst_typefind_SOURCES = gst-run.c
gst_xmlinspect_SOURCES = gst-run.c gst_xmlinspect_SOURCES = gst-run.c
# set correct compile and link flags for all, as well as for specific
AM_CFLAGS = $(GST_CFLAGS)
AM_LDFLAGS = $(GST_LIBS)
gst_inspect_@GST_MAJORMINOR@_LDADD = ../libs/gst/control/libgstcontrol-@GST_MAJORMINOR@.la gst_inspect_@GST_MAJORMINOR@_LDADD = ../libs/gst/control/libgstcontrol-@GST_MAJORMINOR@.la
gst_xmlinspect_@GST_MAJORMINOR@_LDADD = ../libs/gst/control/libgstcontrol-@GST_MAJORMINOR@.la gst_xmlinspect_@GST_MAJORMINOR@_LDADD = ../libs/gst/control/libgstcontrol-@GST_MAJORMINOR@.la
# CFLAGS and libs for nonversioned frontend binaries
AM_CFLAGS = $(GLIB_ONLY_CFLAGS) $(POPT_CFLAGS)
LDADD = $(GLIB_ONLY_LIBS) $(POPT_LIBS)
### man pages we want to install ### man pages we want to install
if GST_DISABLE_REGISTRY if GST_DISABLE_REGISTRY
GST_REGISTRY_MAN= GST_REGISTRY_MAN=