From 1c6814ff53cf0460756272d34109e87c4e513872 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Tue, 2 Mar 2004 10:38:40 +0000 Subject: [PATCH] trim fat from nonversioned binaries Original commit message from CVS: trim fat from nonversioned binaries --- ChangeLog | 7 +++++++ configure.ac | 9 ++++++++- tools/Makefile.am | 28 +++++++++++++++++++++++----- 3 files changed, 38 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index e86c10dc0c..eb91918274 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-03-02 Thomas Vander Stichele + + * configure.ac: + get GLIB_ONLY and POPT flags for the nonversioned binaries + * tools/Makefile.am: + use them + 2004-03-02 Thomas Vander Stichele * gst/gst.c: (init_post): diff --git a/configure.ac b/configure.ac index 3532520110..ebe7e61ac9 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,9 @@ dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0 dnl - interfaces added -> increment AGE dnl - interfaces removed -> AGE = 0 AS_LIBTOOL(GST, 7, 0, 1) +echo libtool AM_PROG_LIBTOOL +echo libtool done AC_CONFIG_SRCDIR([gst/gst.c]) AM_CONFIG_HEADER(config.h) @@ -35,6 +37,7 @@ AM_PROG_CC_STDC AM_PROG_AS AS="${CC}" +echo gettext dnl the gettext stuff needed AM_GNU_GETTEXT_VERSION(0.11.5) AM_GNU_GETTEXT([external]) @@ -212,7 +215,7 @@ dnl required for compilation without warnings GLIB2_REQ="2.2" 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) GLIB_LIBS=$GLIB2_LIBS GLIB_CFLAGS=$GLIB2_CFLAGS @@ -225,6 +228,9 @@ fi GST_PKG_DEPS="glib-2.0, gobject-2.0, gmodule-2.0, gthread-2.0" 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 === if test "x$GST_DISABLE_LOADSAVE" = "xyes" && test "x$GST_DISABLE_REGISTRY" = "xyes" @@ -260,6 +266,7 @@ int main () download the latest version from ftp://ftp.rpm.org/pub/rpm/dist/]) ]) +AC_SUBST(POPT_LIBS) dnl Check for atomic.h dnl Note: use AC_CHECK_HEADER not AC_CHECK_HEADERS, because the latter diff --git a/tools/Makefile.am b/tools/Makefile.am index 391f5751b8..c620363b27 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -39,20 +39,38 @@ bin_PROGRAMS = \ $(GST_OTHER_SRC) $(GST_OTHER_SRC_V) 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 gst_register_@GST_MAJORMINOR@_SOURCES = gst-register.c +gst_register_@GST_MAJORMINOR@_CFLAGS = $(GST_CFLAGS) +gst_register_@GST_MAJORMINOR@_LDFLAGS = $(GST_LIBS) endif if !GST_DISABLE_LOADSAVE 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@_CFLAGS = $(GST_CFLAGS) +gst_compprep_@GST_MAJORMINOR@_LDFLAGS = $(GST_LIBS) gst_xmllaunch_@GST_MAJORMINOR@_SOURCES = gst-launch.c +gst_xmllaunch_@GST_MAJORMINOR@_CFLAGS = $(GST_CFLAGS) +gst_xmllaunch_@GST_MAJORMINOR@_LDFLAGS = $(GST_LIBS) endif 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@_CFLAGS = $(GST_CFLAGS) +gst_launch_@GST_MAJORMINOR@_LDFLAGS = $(GST_LIBS) 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@_CFLAGS = $(GST_CFLAGS) +gst_typefind_@GST_MAJORMINOR@_LDFLAGS = $(GST_LIBS) 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 if !GST_DISABLE_REGISTRY @@ -70,14 +88,14 @@ gst_md5sum_SOURCES = gst-run.c gst_typefind_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_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 if GST_DISABLE_REGISTRY GST_REGISTRY_MAN=