Skip to content

V
vlc
Commit bf81d020 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* Makefile.am: 

    + Removed trailing / from directory names.
    + Used dummy instead of "" in the for/do/done loops.
    + Protected a couple of filenames with double quotes.
parent a77d803e
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 58 deletions
Makefile.am
View file @ bf81d020
...@@ -363,23 +363,23 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) ...@@ -363,23 +363,23 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
if HAVE_BEOS if HAVE_BEOS
xres -o $@ $(srcdir)/share/vlc_beos.rsrc xres -o $@ $(srcdir)/share/vlc_beos.rsrc
mimeset -f $@ mimeset -f $@
rm -Rf $(srcdir)/locale ; mkdir $(srcdir)/locale rm -Rf $(srcdir)/locale ; mkdir -p "$(srcdir)/locale"
for i in $(ALL_LINGUAS); do \ for i in $(ALL_LINGUAS); do \
mkdir -p $(srcdir)/locale/$${i}/LC_MESSAGES ; \ mkdir -p "$(srcdir)/locale/$${i}/LC_MESSAGES" ; \
cp $(srcdir)/po/$${i}.gmo \ cp "$(srcdir)/po/$${i}.gmo" \
$(srcdir)/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ "$(srcdir)/locale/$${i}/LC_MESSAGES/vlc.mo" || true ; \
done done
endif endif
# Install the modules and the symlinks # Install the modules and the symlinks
install-exec-local: install-exec-local:
for i in dummy `$(srcdir)/vlc-config --target plugin` ; do if test "x$$i" != "xdummy" ; then \ for i in "" `$(srcdir)/vlc-config --target plugin` ; do if test -n "$$i" ; then \
$(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f2 -d/`/" ; \ $(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f2 -d/`/" ; \
fi ; done fi ; done
for i in dummy `$(srcdir)/vlc-config --target builtin` `$(srcdir)/vlc-config --target builtin pic` ; do if test "x$$i" != "xdummy" ; then \ for i in "" `$(srcdir)/vlc-config --target builtin` `$(srcdir)/vlc-config --target builtin pic` ; do if test -n "$$i" ; then \
$(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc/" ; \ $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc/" ; \
fi ; done fi ; done
for i in dummy $(ALIASES) ; do if test "x$$i" != "xdummy" ; then \ for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
rm -f "$(DESTDIR)$(bindir)/$$i" && \ rm -f "$(DESTDIR)$(bindir)/$$i" && \
ln -s vlc "$(DESTDIR)$(bindir)/$$i" ; \ ln -s vlc "$(DESTDIR)$(bindir)/$$i" ; \
fi ; done fi ; done
...@@ -395,21 +395,21 @@ VLC.app: vlc plugins ...@@ -395,21 +395,21 @@ VLC.app: vlc plugins
$(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS
$(INSTALL) vlc $(srcdir)/VLC.app/Contents/MacOS/VLC $(INSTALL) vlc $(srcdir)/VLC.app/Contents/MacOS/VLC
$(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/modules $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/modules
for i in dummy `$(srcdir)/vlc-config --target plugin` ; do \ for i in "" `$(srcdir)/vlc-config --target plugin` ; do \
if test "x$$i" != "xdummy" ; then $(INSTALL) $(srcdir)/$$i$(LIBEXT) \ if test -n "$$i" ; then $(INSTALL) $(srcdir)/$$i$(LIBEXT) \
$(srcdir)/VLC.app/Contents/MacOS/modules/ ; \ $(srcdir)/VLC.app/Contents/MacOS/modules/ ; \
fi ; done fi ; done
$(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share
$(INSTALL) -m 644 $(srcdir)/share/*.psf $(srcdir)/share/*.rle \ $(INSTALL) -m 644 $(srcdir)/share/*.psf $(srcdir)/share/*.rle \
$(srcdir)/VLC.app/Contents/MacOS/share $(srcdir)/VLC.app/Contents/MacOS/share
$(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/locale $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/locale
for i in $(ALL_LINGUAS); do \ for i in $(ALL_LINGUAS); do \
mkdir -p $(srcdir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ mkdir -p $(srcdir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
cp $(srcdir)/po/$${i}.gmo $(srcdir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ cp $(srcdir)/po/$${i}.gmo $(srcdir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
mkdir -p $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \ mkdir -p $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \
ln -sf ../English.lproj/InfoPlist.strings $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \ ln -sf ../English.lproj/InfoPlist.strings $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \
ln -sf ../English.lproj/MainMenu.nib $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \ ln -sf ../English.lproj/MainMenu.nib $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \
ln -sf ../English.lproj/vlc.scriptTerminology $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \ ln -sf ../English.lproj/vlc.scriptTerminology $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \
done done
printf "APPLVLC#" >| $(srcdir)/VLC.app/Contents/PkgInfo printf "APPLVLC#" >| $(srcdir)/VLC.app/Contents/PkgInfo
endif endif
...@@ -443,48 +443,48 @@ builtins_pic: FORCE ...@@ -443,48 +443,48 @@ builtins_pic: FORCE
# #
# Check that tmp isn't in the way # Check that tmp isn't in the way
package-win32: package-win32:
@if test -e $(srcdir)/tmp; then \ @if test -e "$(srcdir)/tmp"; then \
echo "Error: please remove $(srcdir)/tmp, it is in the way"; \ echo "Error: please remove $(srcdir)/tmp, it is in the way"; \
false; \ false; \
else \ else \
echo "OK."; mkdir $(srcdir)/tmp; \ echo "OK."; mkdir -p "$(srcdir)/tmp"; \
fi fi
# Create installation script # Create installation script
cp $(srcdir)/install-win32 $(srcdir)/tmp/nsi cp "$(srcdir)/install-win32" "$(srcdir)/tmp/nsi"
# Copy relevant files # Copy relevant files
cp $(srcdir)/vlc$(EXEEXT) $(srcdir)/tmp/ cp "$(srcdir)/vlc$(EXEEXT)" "$(srcdir)/tmp/"
$(STRIP) $(srcdir)/tmp/vlc$(EXEEXT) $(STRIP) "$(srcdir)/tmp/vlc$(EXEEXT)"
cp $(srcdir)/INSTALL.win32 $(srcdir)/tmp/INSTALL.txt cp "$(srcdir)/INSTALL.win32" "$(srcdir)/tmp/INSTALL.txt"
unix2dos $(srcdir)/tmp/INSTALL.txt unix2dos "$(srcdir)/tmp/INSTALL.txt"
for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \ for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
do cp $(srcdir)/$$file $(srcdir)/tmp/$${file}.txt ; \ do cp "$(srcdir)/$$file" "$(srcdir)/tmp/$${file}.txt" ; \
unix2dos $(srcdir)/tmp/$${file}.txt ; done unix2dos "$(srcdir)/tmp/$${file}.txt" ; done
mkdir $(srcdir)/tmp/plugins mkdir -p "$(srcdir)/tmp/plugins"
for i in dummy `$(srcdir)/vlc-config --target plugin` ; do \ for i in "" `$(srcdir)/vlc-config --target plugin` ; do \
if test "x$$i" != "xdummy" ; then \ if test -n "$$i" ; then \
$(INSTALL) $(srcdir)/$$i$(LIBEXT) $(srcdir)/tmp/plugins/ ; \ $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" "$(srcdir)/tmp/plugins/" ; \
fi ; done fi ; done
for i in dummy $(srcdir)/tmp/plugins/*$(LIBEXT) ; \ for i in "" $(srcdir)/tmp/plugins/*$(LIBEXT) ; \
do if test $$i != dummy ; then $(STRIP) $$i ; fi ; done do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
mkdir $(srcdir)/tmp/share mkdir -p "$(srcdir)/tmp/share"
cp $(srcdir)/share/*.rle $(srcdir)/tmp/share/ ; cp $(srcdir)/share/*.rle $(srcdir)/tmp/share/ ;
mkdir $(srcdir)/tmp/locale mkdir $(srcdir)/tmp/locale
for i in $(ALL_LINGUAS); do \ for i in $(ALL_LINGUAS); do \
mkdir -p $(srcdir)/tmp/locale/$${i}/LC_MESSAGES ; \ mkdir -p "$(srcdir)/tmp/locale/$${i}/LC_MESSAGES" ; \
cp $(srcdir)/po/$${i}.gmo \ cp "$(srcdir)/po/$${i}.gmo" \
$(srcdir)/tmp/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ "$(srcdir)/tmp/locale/$${i}/LC_MESSAGES/vlc.mo" || true ; \
done done
mkdir -p $(srcdir)/tmp/skins/default mkdir -p $(srcdir)/tmp/skins/default
for i in $(srcdir)/share/skins/default/*.*; do \ for i in $(srcdir)/share/skins/default/*.*; do \
cp $$i $(srcdir)/tmp/skins/default/ || true ; \ cp $$i $(srcdir)/tmp/skins/default/ || true ; \
done done
for i in $(srcdir)/doc/skins/*.txt; do \ for i in $(srcdir)/doc/skins/*.txt; do \
cp $$i $(srcdir)/tmp/skins/ || true ; \ cp $$i $(srcdir)/tmp/skins/ || true ; \
done done
# Create package # Create package
...@@ -495,24 +495,24 @@ package-win32: ...@@ -495,24 +495,24 @@ package-win32:
package-beos: package-beos:
# Check that tmp isn't in the way # Check that tmp isn't in the way
@if test -e $(srcdir)/tmp; then \ @if test -e $(srcdir)/tmp; then \
echo "Error: please remove $(srcdir)/tmp, it is in the way"; \ echo "Error: please remove $(srcdir)/tmp, it is in the way"; \
false; \ false; \
else \ else \
echo "OK."; mkdir $(srcdir)/tmp; \ echo "OK."; mkdir $(srcdir)/tmp; \
fi fi
# Copy relevant files # Copy relevant files
mkdir -p $(srcdir)/tmp/vlc mkdir -p $(srcdir)/tmp/vlc
cd $(srcdir) && \ cd $(srcdir) && \
cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/ cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/
# We cannot use ${PLUGIN_FILES}, it looks like it is too long for the BeOS shell... # We cannot use ${PLUGIN_FILES}, it looks like it is too long for the BeOS shell...
if [ `find $(srcdir)/modules -name "lib*_plugin.so" | wc -l` -gt 0 ]; then \ if [ `find $(srcdir)/modules -name "lib*_plugin.so" | wc -l` -gt 0 ]; then \
mkdir -p $(srcdir)/tmp/vlc/plugins; \ mkdir -p $(srcdir)/tmp/vlc/plugins; \
find $(srcdir)/modules -name "lib*_plugin.so" | xargs -i{} cp {} $(srcdir)/tmp/vlc/plugins/; \ find $(srcdir)/modules -name "lib*_plugin.so" | xargs -i{} cp {} $(srcdir)/tmp/vlc/plugins/; \
fi fi
for i in $(ALL_LINGUAS); do \ for i in $(ALL_LINGUAS); do \
mkdir -p $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES ; \ mkdir -p $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES ; \
cp $(srcdir)/po/$${i}.gmo $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ cp $(srcdir)/po/$${i}.gmo $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
done done
mkdir -p $(srcdir)/tmp/vlc/share mkdir -p $(srcdir)/tmp/vlc/share
cp $(srcdir)/share/*.rle $(srcdir)/tmp/vlc/share/ cp $(srcdir)/share/*.rle $(srcdir)/tmp/vlc/share/
...@@ -526,7 +526,7 @@ package-beos: ...@@ -526,7 +526,7 @@ package-beos:
# Create package without debug symbols # Create package without debug symbols
strip $(srcdir)/tmp/vlc-${VERSION}/vlc strip $(srcdir)/tmp/vlc-${VERSION}/vlc
if [ -d $(srcdir)/tmp/vlc-${VERSION}/plugins ]; then \ if [ -d $(srcdir)/tmp/vlc-${VERSION}/plugins ]; then \
strip $(srcdir)/tmp/vlc-${VERSION}/plugins/lib*_plugin.so; \ strip $(srcdir)/tmp/vlc-${VERSION}/plugins/lib*_plugin.so; \
fi fi
xres -o $(srcdir)/tmp/vlc-${VERSION}/vlc $(srcdir)/share/vlc_beos.rsrc xres -o $(srcdir)/tmp/vlc-${VERSION}/vlc $(srcdir)/share/vlc_beos.rsrc
mimeset -f $(srcdir)/tmp/vlc-${VERSION}/* $(srcdir)/tmp/vlc-${VERSION}/*/* mimeset -f $(srcdir)/tmp/vlc-${VERSION}/* $(srcdir)/tmp/vlc-${VERSION}/*/*
...@@ -538,16 +538,16 @@ package-beos: ...@@ -538,16 +538,16 @@ package-beos:
package-macosx: package-macosx:
# Check that tmp isn't in the way # Check that tmp isn't in the way
@if test -e $(srcdir)/tmp; then \ @if test -e "$(srcdir)/tmp"; then \
echo "Error: please remove $(srcdir)/tmp, it is in the way"; \ echo "Error: please remove $(srcdir)/tmp, it is in the way"; \
false; \ false; \
else \ else \
echo "OK."; mkdir $(srcdir)/tmp; \ echo "OK."; mkdir -p "$(srcdir)/tmp"; \
fi fi
# Copy relevant files # Copy relevant files
cp -R $(srcdir)/VLC.app $(srcdir)/tmp/ cp -R "$(srcdir)/VLC.app" "$(srcdir)/tmp/"
cd $(srcdir) && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS tmp/ cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS tmp/
# Create disk image # Create disk image
$(srcdir)/extras/MacOSX/macosx-dmg 18 "vlc-${VERSION}" $(srcdir)/tmp/* $(srcdir)/extras/MacOSX/macosx-dmg 18 "vlc-${VERSION}" $(srcdir)/tmp/*
...@@ -616,18 +616,18 @@ mozilla_plugindir = $(libdir)/mozilla/plugins ...@@ -616,18 +616,18 @@ mozilla_plugindir = $(libdir)/mozilla/plugins
$(LIBRARIES_mozilla): $(mozilla_libplugin_a_OBJECTS) \ $(LIBRARIES_mozilla): $(mozilla_libplugin_a_OBJECTS) \
$(mozilla_libplugin_a_DEPENDENCIES) $(mozilla_libplugin_a_DEPENDENCIES)
$(CXXLINK) $(mozilla_libplugin_a_OBJECTS) $(DATA_npvlc_rc) \ $(CXXLINK) $(mozilla_libplugin_a_OBJECTS) $(DATA_npvlc_rc) \
lib/libvlc_pic.a -shared \ lib/libvlc_pic.a -shared \
`$(VLC_CONFIG) --libs vlc mozilla builtin pic` `$(VLC_CONFIG) --libs vlc mozilla builtin pic`
mozilla_vlcintf_xpt_DATA = mozilla/vlcintf.xpt mozilla_vlcintf_xpt_DATA = mozilla/vlcintf.xpt
mozilla_vlcintf_xptdir = $(libdir)/mozilla/components mozilla_vlcintf_xptdir = $(libdir)/mozilla/components
mozilla/vlcintf.xpt: Makefile mozilla/vlcintf.idl mozilla/vlcintf.xpt: Makefile mozilla/vlcintf.idl
$(XPIDL) -I/usr/share/idl/mozilla -m typelib \ $(XPIDL) -I/usr/share/idl/mozilla -m typelib \
-o mozilla/vlcintf mozilla/vlcintf.idl -o mozilla/vlcintf mozilla/vlcintf.idl
mozilla/vlcintf.h: Makefile mozilla/vlcintf.idl mozilla/vlcintf.h: Makefile mozilla/vlcintf.idl
$(XPIDL) -I/usr/share/idl/mozilla -m header \ $(XPIDL) -I/usr/share/idl/mozilla -m header \
-o mozilla/vlcintf mozilla/vlcintf.idl -o mozilla/vlcintf mozilla/vlcintf.idl
if HAVE_WIN32 if HAVE_WIN32
DATA_npvlc_rc = $(noinst_mozilla_npvlc_rc_DATA) DATA_npvlc_rc = $(noinst_mozilla_npvlc_rc_DATA)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment