Changeset 3e82c0f591561f29fcfbf7c6f35d08f79cfd8f4e

Show
Ignore:
Timestamp:
28/04/08 21:31:32 (6 months ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1209411092 +0300
git-parent:

[d43f6298ec5696a3542fd53c0e9e0b8a82682c9b]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1209411092 +0300
Message:

Remove a bunch of obsoleted kludges

We don't need to invoke make twice in every directory, and we don't need
the awful libtool install kludge anymore.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/common.am

    rbe5bff3 r3e82c0f  
    3434endif 
    3535 
    36 all: all-modules 
    37  
    3836nice: 
    3937    $(top_builddir)/compile 
    40  
    41 # Find out which modules were enabled and tell make to build them 
    42 all-modules: 
    43     @set fnord $$MAKEFLAGS; amf=$$2; targets=`\ 
    44     z=$$($(VLC_CONFIG) --list plugin); for mod in $(mods); do case "$$z " in *\ $${mod}\ *) echo lib$${mod}_plugin.la;; esac; done; \ 
    45     `; case "$$targets" in *lib*) $(MAKE) $(AM_MAKEFLAGS) $$targets || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; ;; esac; \ 
    46     test -z "$$fail" 
    4738 
    4839if MAINTAINER_MODE 
     
    5041    cd \$(top_srcdir) && \$(SHELL) modules/genmf $(dir) 
    5142endif 
    52  
    53 mostlyclean-local: 
    54     -rm -f -- *.la 
    55  
    56 ### automake creates libvlcdir after running install-*-local 
    57 ### so we have to create it ourselves first 
    58 install-exec-local: all-modules 
    59     @if test -z "$(libvlc_LTLIBRARIES)"; then \ 
    60       z=$$($(VLC_CONFIG) --list plugin); \ 
    61       m=`for mod in $(mods); do case "$$z " in *\ $${mod}\ *) printf " lib$${mod}_plugin.la" ;; esac; done` ; \ 
    62       test -z "$$m" || \ 
    63         $(MAKE) $(AM_MAKEFLAGS) libvlc_LTLIBRARIES="$$m" install-libvlcLTLIBRARIES || exit $$? ; \ 
    64     fi 
    65  
    66 uninstall-local: 
    67     @if test -z "$(libvlc_LTLIBRARIES)"; then \ 
    68       z=$$($(VLC_CONFIG) --list plugin); \ 
    69       m=`for mod in $(mods); do case "$$z " in *\ $${mod}\ *) printf " lib$${mod}_plugin.la" ;; esac; done` ; \ 
    70       test -z "$$m" || \ 
    71         $(MAKE) $(AM_MAKEFLAGS) libvlc_LTLIBRARIES="$$m" uninstall-libvlcLTLIBRARIES || exit $$?; \ 
    72     fi 
    73