diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2003-10-14 21:58:22 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2003-10-14 21:58:22 +0000 |
| commit | 90a24be6db150d94d8ceea2b1f56dff8a2880d01 (patch) | |
| tree | f2c598a982d1ef6fe4c97cdb781c70a28ecf8ab0 | |
| parent | 663b38cc9d22bc6efd3803f957c18b2df893b51a (diff) | |
| download | xine-lib-90a24be6db150d94d8ceea2b1f56dff8a2880d01.tar.gz xine-lib-90a24be6db150d94d8ceea2b1f56dff8a2880d01.tar.bz2 | |
made libtool-nofpic silent and not installing .la files at all
CVS patchset: 5519
CVS date: 2003/10/14 21:58:22
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | misc/Makefile.common | 1 | ||||
| -rw-r--r-- | src/xine-engine/Makefile.am | 1 | ||||
| -rw-r--r-- | src/xine-utils/Makefile.am | 1 |
4 files changed, 9 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 37fb33e8d..60dde40e8 100644 --- a/configure.ac +++ b/configure.ac @@ -1852,12 +1852,17 @@ if test x"$enable_fpic" != x; then ;; esac fi + +dnl made libtool-nofpic silent and not installing plugins's .la files +cat libtool | sed -e 's/^show=\".*/show=\":\"/g' -e 's/# Install the pseudo\-library.*/continue/g' > libtool.tmp + if test x$no_fpic = "xyes"; then - cat libtool | sed -e 's/^pic_flag=/#pic_flag=/' > libtool-nofpic + cat libtool.tmp | sed -e 's/^pic_flag=/#pic_flag=/' > libtool-nofpic else - cat libtool > libtool-nofpic + cat libtool.tmp > libtool-nofpic fi +rm -f libtool.tmp chmod +x libtool-nofpic diff --git a/misc/Makefile.common b/misc/Makefile.common index 7d96402af..b723d7503 100644 --- a/misc/Makefile.common +++ b/misc/Makefile.common @@ -6,7 +6,6 @@ $(XINE_LIB): install-data-hook: @if test $$MAKELEVEL -le 4 ; then \ - find $(DESTDIR)$(XINE_PLUGINDIR) -name "*.la" -exec rm {} \; ; \ if test -x "$(top_srcdir)/post-install.sh" ; then \ $(top_srcdir)/post-install.sh ; \ fi \ diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index c298789bf..b9edc03a5 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -2,6 +2,7 @@ include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(THREAD_CFLAGS) $(X_CFLAGS) $(FT2_CFLAGS) +LIBTOOL = $(SHELL) $(top_builddir)/libtool lib_LTLIBRARIES = libxine.la XINEUTILS_LIB = $(top_builddir)/src/xine-utils/libxineutils.la diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am index 60e779099..0ce5ea9cb 100644 --- a/src/xine-utils/Makefile.am +++ b/src/xine-utils/Makefile.am @@ -1,5 +1,6 @@ include $(top_srcdir)/misc/Makefile.common +LIBTOOL = $(SHELL) $(top_builddir)/libtool noinst_LTLIBRARIES = libxineutils.la EXTRA_DIST = ppcasm_string.S ppc_asm.tmpl |