Changeset 247becb9ee5acddd816704aa01c32c6e517a49e5

Show
Ignore:
Timestamp:
24/05/03 14:35:06 (6 years ago)
Author:
Sam Hocevar <sam@videolan.org>
git-committer:
Sam Hocevar <sam@videolan.org> 1053779706 +0000
git-parent:

[23455b3540fa216b3f67242b0d1e5891c471577d]

git-author:
Sam Hocevar <sam@videolan.org> 1053779706 +0000
Message:
  • ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • Makefile.am

    r71bca56 r247becb  
    217217 
    218218include/vlc_symbols.h: Makefile $(HEADERS_include) 
    219     ./toolbox --update-includes $(BUILTINS) 
     219    cd $(srcdir) && ./toolbox --update-includes $(BUILTINS) 
    220220 
    221221src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include) 
    222     ./toolbox --update-includes $(BUILTINS) 
     222    cd $(srcdir) && ./toolbox --update-includes $(BUILTINS) 
    223223 
    224224src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in 
    225     ./toolbox --update-includes $(BUILTINS) 
     225    cd $(srcdir) && ./toolbox --update-includes $(BUILTINS) 
    226226 
    227227# These dependencies are mandatory 
    …… 
    234234 
    235235intl/libintl.a: FORCE 
    236     cd intl && $(MAKE) 
     236    cd $(srcdir)/intl && $(MAKE) 
    237237 
    238238if BUILD_INTL 
    …… 
    317317    $(NULL) 
    318318 
    319 show-libvlc-sources: FORCE 
    320     @echo X: $(SOURCES_libvlc_common) $(SOURCES_libvlc_win32) $(SOURCES_libvlc_dirent) $(SOURCES_libvlc_getopt) 
    321  
    322 show-libvlc-headers: FORCE 
    323     @echo X: $(HEADERS_include) $(HEADERS_include_built) 
    324  
    325 show-libvlc-pkg-headers: FORCE 
    326     @echo X: $(dist_pkginclude_HEADERS) 
    327  
    328319dist-hook: 
    329     mv vlc.ebuild vlc-${VERSION}.ebuild 
    330     cd $(distdir); ./toolbox --update-vc 
     320    mv $(distdir)/vlc.ebuild $(distdir)/vlc-${VERSION}.ebuild 
     321    cd $(distdir) && $(srcdir)/toolbox --update-vc 
    331322 
    332323############################################################################### 
    …… 
    472463 
    473464vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) 
    474     @rm -f vlc$(EXEEXT) 
     465    @rm -f $(srcdir)/vlc$(EXEEXT) 
    475466    $(LINK) $(vlc_LDFLAGS) $(vlc_OBJECTS) $(vlc_LDADD) $(LIBS) 
    476467 
    477468if HAVE_BEOS 
    478     xres -o $@ ./share/vlc_beos.rsrc 
     469    xres -o $@ $(srcdir)/share/vlc_beos.rsrc 
    479470    mimeset -f $@ 
    480     rm -Rf locale ; mkdir locale 
     471    rm -Rf $(srcdir)/locale ; mkdir $(srcdir)/locale 
    481472    for i in $(ALL_LINGUAS); do \ 
    482         mkdir -p locale/$${i}/LC_MESSAGES ; \ 
    483         cp po/$${i}.gmo locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ 
     473        mkdir -p $(srcdir)/locale/$${i}/LC_MESSAGES ; \ 
     474        cp $(srcdir)/po/$${i}.gmo \ 
     475            $(srcdir)/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ 
    484476    done 
    485477endif 
    …… 
    498490VLC.app: vlc $(PLUGIN_FILES) 
    499491    rm -Rf VLC.app 
    500     cd extras/MacOSX ; pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)' 
    501     cp -r extras/MacOSX/build/vlc.bundle ./VLC.app 
    502     $(INSTALL) -d VLC.app/Contents/MacOS 
    503     $(INSTALL) vlc VLC.app/Contents/MacOS/VLC 
    504     $(INSTALL) -d VLC.app/Contents/MacOS/modules 
     492    cd $(srcdir)/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)' 
     493    cp -r $(srcdir)/extras/MacOSX/build/vlc.bundle $(srcdir)/VLC.app 
     494    $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS 
     495    $(INSTALL) vlc $(srcdir)/VLC.app/Contents/MacOS/VLC 
     496    $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/modules 
    505497    for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \ 
    506         $(INSTALL) $$i VLC.app/Contents/MacOS/modules/ ; \ 
     498        $(INSTALL) $(srcdir)/$$i \ 
     499            $(srcdir)/VLC.app/Contents/MacOS/modules/ ; \ 
    507500    fi ; done 
    508     $(INSTALL) -d VLC.app/Contents/MacOS/share 
    509     $(INSTALL) -m 644 share/*.psf share/*.rle VLC.app/Contents/MacOS/share 
    510     $(INSTALL) -d VLC.app/Contents/MacOS/locale 
     501    $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share 
     502    $(INSTALL) -m 644 $(srcdir)/share/*.psf $(srcdir)/share/*.rle \ 
     503        $(srcdir)/VLC.app/Contents/MacOS/share 
     504    $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/locale 
    511505    for i in $(ALL_LINGUAS); do \ 
    512         mkdir -p VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ 
    513         cp po/$${i}.gmo VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ 
    514         mkdir -p VLC.app/Contents/Resources/$${i}.lproj ; \ 
    515         ln -sf ../English.lproj/InfoPlist.strings VLC.app/Contents/Resources/$${i}.lproj ; \ 
    516         ln -sf ../English.lproj/MainMenu.nib VLC.app/Contents/Resources/$${i}.lproj ; \ 
    517         ln -sf ../English.lproj/vlc.scriptTerminology VLC.app/Contents/Resources/$${i}.lproj ; \ 
     506        mkdir -p $(srcdir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ 
     507        cp $(srcdir)/po/$${i}.gmo $(srcdir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ 
     508        mkdir -p $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \ 
     509        ln -sf ../English.lproj/InfoPlist.strings $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \ 
     510        ln -sf ../English.lproj/MainMenu.nib $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \ 
     511        ln -sf ../English.lproj/vlc.scriptTerminology $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \ 
    518512    done 
    519     echo -n "APPLVLC#" >| VLC.app/Contents/PkgInfo 
     513    printf "APPLVLC#" >| $(srcdir)/VLC.app/Contents/PkgInfo 
    520514endif 
    521515 
    …… 
    525519noinst_share_vlc_win32_rcdir = $(libdir) 
    526520share/vlc_win32_rc.$(OBJEXT): share/vlc_win32_rc.rc 
    527     $(WINDRES) --include-dir share -i $< -o $@ 
     521    $(WINDRES) --include-dir $(srcdir)/share -i $< -o $@ 
    528522endif 
    529523 
    …… 
    537531# Check that tmp isn't in the way 
    538532package-win32: 
    539     @if test -e tmp; then \ 
    540         echo "Error: please remove ./tmp, it is in the way"; false; \ 
     533    @if test -e $(srcdir)/tmp; then \ 
     534        echo "Error: please remove $(srcdir)/tmp, it is in the way"; \ 
     535        false; \ 
    541536    else \ 
    542         echo "OK."; mkdir tmp; \ 
     537        echo "OK."; mkdir $(srcdir)/tmp; \ 
    543538    fi 
    544539# Create installation script 
    545     cp install-win32 tmp/nsi 
     540    cp $(srcdir)/install-win32 $(srcdir)/tmp/nsi 
    546541# Copy relevant files 
    547     cp vlc$(EXEEXT) tmp/  
    548     $(STRIP) tmp/vlc$(EXEEXT) 
    549     cp INSTALL.win32 tmp/INSTALL.txt ; unix2dos tmp/INSTALL.txt 
     542    cp $(srcdir)/vlc$(EXEEXT) $(srcdir)/tmp/  
     543    $(STRIP) $(srcdir)/tmp/vlc$(EXEEXT) 
     544    cp $(srcdir)/INSTALL.win32 $(srcdir)/tmp/INSTALL.txt 
     545    unix2dos $(srcdir)/tmp/INSTALL.txt 
    550546    for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \ 
    551            do cp $$file tmp/$${file}.txt ; \ 
    552            unix2dos tmp/$${file}.txt ; done 
    553  
    554     mkdir tmp/plugins 
     547        do cp $(srcdir)/$$file $(srcdir)/tmp/$${file}.txt ; \ 
     548        unix2dos $(srcdir)/tmp/$${file}.txt ; done 
     549 
     550    mkdir $(srcdir)/tmp/plugins 
    555551    for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \ 
    556         $(INSTALL) $$i tmp/plugins/ ; \ 
     552        $(INSTALL) $(srcdir)/$$i $(srcdir)/tmp/plugins/ ; \ 
    557553    fi ; done 
    558554 
    559     for i in dummy tmp/plugins/*$(LIBEXT) ; \ 
    560         do if test $$i != tmp/plugins/libwin32_plugin$(LIBEXT) \ 
     555    for i in dummy $(srcdir)/tmp/plugins/*$(LIBEXT) ; \ 
     556        do if test $$i != $(srcdir)/tmp/plugins/libwin32_plugin$(LIBEXT) \ 
    561557        -a $$i != dummy ; then $(STRIP) $$i ; fi ; done 
    562558 
    563     mkdir tmp/share 
    564     cp share/*.rle tmp/share/ ; 
    565  
    566     mkdir tmp/locale 
     559    mkdir $(srcdir)/tmp/share 
     560    cp $(srcdir)/share/*.rle $(srcdir)/tmp/share/ ; 
     561 
     562    mkdir $(srcdir)/tmp/locale 
    567563    for i in $(ALL_LINGUAS); do \ 
    568         mkdir -p tmp/locale/$${i}/LC_MESSAGES ; \ 
    569         cp po/$${i}.gmo tmp/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ 
     564        mkdir -p $(srcdir)/tmp/locale/$${i}/LC_MESSAGES ; \ 
     565        cp $(srcdir)/po/$${i}.gmo \ 
     566           $(srcdir)/tmp/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ 
    570567    done 
    571568 
    572     mkdir -p tmp/skins/default 
    573     for i in share/skins/default/*.*; do \ 
    574         cp $$i tmp/skins/default/ || true ; \ 
     569    mkdir -p $(srcdir)/tmp/skins/default 
     570    for i in $(srcdir)/share/skins/default/*.*; do \ 
     571        cp $$i $(srcdir)/tmp/skins/default/ || true ; \ 
    575572    done 
    576     for i in doc/skins/*.txt; do \ 
    577         cp $$i tmp/skins/ || true ; \ 
     573    for i in $(srcdir)/doc/skins/*.txt; do \ 
     574        cp $$i $(srcdir)/tmp/skins/ || true ; \ 
    578575    done 
    579576 
    580     $(MAKE) -C doc/faq html ; 
    581     cp doc/faq/faq.html tmp/FAQ.htm ; 
     577    $(MAKE) -C $(srcdir)/doc/faq html ; 
     578    cp $(srcdir)/doc/faq/faq.html $(srcdir)/tmp/FAQ.htm ; 
    582579 
    583580# Create package  
    584     wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} tmp/nsi 
     581    wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} $(srcdir)/tmp/nsi 
    585582# Clean up 
    586     rm -Rf tmp 
     583    rm -Rf $(srcdir)/tmp 
    587584 
    588585package-beos: 
    589586# Check that tmp isn't in the way 
    590     @if test -e tmp; then \ 
    591         echo "Error: please remove ./tmp, it is in the way"; false; \ 
     587    @if test -e $(srcdir)/tmp; then \ 
     588        echo "Error: please remove $(srcdir)/tmp, it is in the way"; \ 
     589        false; \ 
    592590    else \ 
    593         echo "OK."; mkdir tmp; \ 
     591        echo "OK."; mkdir $(srcdir)/tmp; \ 
    594592    fi 
    595593 
    596594# Copy relevant files 
    597     mkdir -p tmp/vlc 
    598     cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/ 
     595    mkdir -p $(srcdir)/tmp/vlc 
     596    cd $(srcdir) && \ 
     597        cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/ 
    599598# We cannot use ${PLUGIN_FILES}, it looks like it is too long for the BeOS shell... 
    600     if [ `find modules -name "lib*_plugin.so" | wc -l` -gt 0 ]; then \ 
    601         mkdir -p tmp/vlc/plugins; \ 
    602         find modules -name "lib*_plugin.so" | xargs -i{} cp {} tmp/vlc/plugins/; \ 
     599    if [ `find $(srcdir)/modules -name "lib*_plugin.so" | wc -l` -gt 0 ]; then \ 
     600        mkdir -p $(srcdir)/tmp/vlc/plugins; \ 
     601        find $(srcdir)/modules -name "lib*_plugin.so" | xargs -i{} cp {} $(srcdir)/tmp/vlc/plugins/; \ 
    603602    fi 
    604603    for i in $(ALL_LINGUAS); do \ 
    605         mkdir -p tmp/vlc/locale/$${i}/LC_MESSAGES ; \ 
    606         cp po/$${i}.gmo tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ 
     604        mkdir -p $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES ; \ 
     605        cp $(srcdir)/po/$${i}.gmo $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ 
    607606    done 
    608     mkdir -p tmp/vlc/share 
    609     cp share/*.rle tmp/vlc/share/ 
     607    mkdir -p $(srcdir)/tmp/vlc/share 
     608    cp $(srcdir)/share/*.rle $(srcdir)/tmp/vlc/share/ 
    610609 
    611610# Create package with debug symbols 
    612     mimeset -f tmp/vlc/* tmp/vlc/*/* 
    613     mv tmp/vlc tmp/vlc-${VERSION} 
    614     (cd tmp ; zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} ) 
    615     mv tmp/vlc-${VERSION}-BeOS.zip . 
     611    mimeset -f $(srcdir)/tmp/vlc/* $(srcdir)/tmp/vlc/*/* 
     612    mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} 
     613    (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} ) 
     614    mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/ 
    616615 
    617616# Create package without debug symbols 
    618     strip tmp/vlc-${VERSION}/vlc 
    619     if [ -d tmp/vlc-${VERSION}/plugins ]; then \ 
    620         strip tmp/vlc-${VERSION}/plugins/lib*_plugin.so; \ 
     617    strip $(srcdir)/tmp/vlc-${VERSION}/vlc 
     618    if [ -d $(srcdir)/tmp/vlc-${VERSION}/plugins ]; then \ 
     619        strip $(srcdir)/tmp/vlc-${VERSION}/plugins/lib*_plugin.so; \ 
    621620    fi 
    622     xres -o tmp/vlc-${VERSION}/vlc share/vlc_beos.rsrc 
    623     mimeset -f tmp/vlc-${VERSION}/* tmp/vlc-${VERSION}/*/* 
    624     (cd tmp ; zip -9 -r vlc-${VERSION}-BeOS-stripped.zip vlc-${VERSION} ) 
    625     mv tmp/vlc-${VERSION}-BeOS-stripped.zip . 
     621    xres -o $(srcdir)/tmp/vlc-${VERSION}/vlc $(srcdir)/share/vlc_beos.rsrc 
     622    mimeset -f $(srcdir)/tmp/vlc-${VERSION}/* $(srcdir)/tmp/vlc-${VERSION}/*/* 
     623    (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS-stripped.zip vlc-${VERSION} ) 
     624    mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-stripped.zip $(srcdir)/ 
    626625 
    627626# Clean up 
    628     rm -Rf tmp 
     627    rm -Rf $(srcdir)/tmp 
    629628 
    630629package-macosx: 
    631630# Check that tmp isn't in the way 
    632     @if test -e tmp; then \ 
    633         echo "Error: please remove ./tmp, it is in the way"; false; \ 
     631    @if test -e $(srcdir)/tmp; then \ 
     632        echo "Error: please remove $(srcdir)/tmp, it is in the way"; \ 
     633        false; \ 
    634634    else \ 
    635         echo "OK."; mkdir tmp; \ 
     635        echo "OK."; mkdir $(srcdir)/tmp; \ 
    636636    fi 
    637637 
    638638# Copy relevant files  
    639     cp -R VLC.app tmp/ 
    640     cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS tmp/ 
     639    cp -R $(srcdir)/VLC.app $(srcdir)/tmp/ 
     640    cd $(srcdir) && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS tmp/ 
    641641 
    642642# Create disk image  
    643     ./extras/MacOSX/macosx-dmg 18 "vlc-${VERSION}" tmp/*  
     643    $(srcdir)/extras/MacOSX/macosx-dmg 18 "vlc-${VERSION}" $(srcdir)/tmp/*  
    644644 
    645645# Clean up 
    646     rm -Rf tmp 
     646    rm -Rf $(srcdir)/tmp 
    647647 
    648648############################################################################### 
    …… 
    728728noinst_mozilla_npvlc_rcdir = $(libdir) 
    729729mozilla/npvlc_rc.$(OBJEXT): mozilla/npvlc_rc.rc 
    730     $(WINDRES) --include-dir mozilla -i $< -o $@ 
     730    $(WINDRES) --include-dir $(srcdir)/mozilla -i $< -o $@ 
    731731endif 
    732732endif