Build VLC aliases cleanly (don't need to parse argv[0])

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1f19cd4278b953d355a913fb4c50b94af589dccb..3d099306b72c41bd9a6126109d4fc167fa6f11ac 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -236,6 +236,14 @@ vlc-config.in: vlc-config.in.in
 CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin
 DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
 
+# Shortcut for developpers to rebuild the core (libvlc + vlc)
+# Don't use it if you don't know what it is about.
+# Don't complain if it doesn't work. -- Courmisch
+libvlc:
+       cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
+
+.PHONY: libvlc
+
 ###############################################################################
 # Building vlc
 ###############################################################################
@@ -262,15 +270,9 @@ LIBVLC = src/$(LIB_libvlc)
 nice:
        $(top_builddir)/compile
 
-# Shortcut for developpers to rebuild the core (libvlc + vlc)
-# Don't use it if you don't know what it is about.
-# Don't complain if it doesn't work. -- Courmisch
-libvlc:
-       cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
-
 core: libvlc vlc$(EXEEXT)
 
-.PHONY: libvlc core
+.PHONY: core
 
 vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
        @rm -f vlc$(EXEEXT)
@@ -309,19 +311,35 @@ vlc-bundle: vlc
        find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \;
 endif
 
-# Install the symlinks
-install-exec-local: install-binPROGRAMS
-       inst="`echo vlc | sed -e '$(transform)'`" ; \
-       for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
-         rm -f "$(DESTDIR)$(bindir)/$$i" && \
-         ln -sf "$${inst}" "$(DESTDIR)$(bindir)/$$i" ; \
-       fi ; done
+###############################################################################
+# Building aliases
+###############################################################################
+
+ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc
+bin_SCRIPTS += $(ALIASES)
+EXTRA_SCRIPTS = $(ALL_ALIASES)
+
+dist_noinst_SCRIPTS += make-alias
+
+MKALIAS = bindir="$(bindir)" transform="$(transform)" $(top_srcdir)/make-alias $@
 
-# the opposite of install-{data,exec}-local
-uninstall-local:
-       for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
-         rm -f "$(DESTDIR)$(bindir)/$$i" ; \
-       fi ; done
+cvlc: make-alias
+       $(MKALIAS) dummy
+
+rvlc: make-alias
+       $(MKALIAS) rc
+
+svlc: make-alias
+       $(MKALIAS) skins2
+
+wxvlc: make-alias
+       $(MKALIAS) wx
+
+qvlc: make-alias
+       $(MKALIAS) qt4
+
+nvlc: make-alias
+       $(MKALIAS) ncurses
 
 if HAVE_DARWIN
 # Create the MacOS X app
@@ -983,38 +1001,7 @@ package-macosx:
        hdiutil attach -readwrite -noverify -noautoopen "$(top_builddir)/vlc-${VERSION}.dmg" -mountpoint "$(top_builddir)/vlcmnt/vlc-${VERSION}" ;
        bless --folder "$(top_builddir)/vlcmnt/vlc-${VERSION}/" --openfolder "$(top_builddir)/vlcmnt/vlc-${VERSION}" ;
        sleep 1 # Make sure operation completes
-
-# Place the image disk finder icon at the correct place
-# Note: careful here the finder does some weird things
-# sometimes. delays in the script should prevent those.
        cd "$(srcdir)"
-#      osascript -e "tell application \"Finder\"" \
-#      -e "   set f to POSIX file (\"$(top_builddir)/vlcmnt/vlc-${VERSION}/\" as string) as alias" \
-#      -e "   tell folder f" \
-#      -e "       open" \
-#      -e "       tell container window" \
-#      -e "          set toolbar visible to false" \
-#      -e "          set statusbar visible to false" \
-#      -e "          set current view to icon view" \
-#      -e "          delay 1 -- Sync" \
-#      -e "          set the bounds to {50, 100, 1000, 1000} -- Big size so the finder won't do silly things" \
-#      -e "       end tell" \
-#      -e "       delay 1 -- Sync" \
-#      -e "       set icon size of the icon view options of container window to 128" \
-#      -e "       set arrangement of the icon view options of container window to not arranged" \
-#      -e "       set background picture of the icon view options of container window to file \".background:background.png\"" \
-#      -e "       set position of item \"VLC.app\" to {100, 20}" \
-#      -e "       set position of item \"Applications\" to {310, 20}" \
-#      -e "       set position of item \"Goodies\" to {40, 200}" \
-#      -e "       set position of item \"Read Me.rtf\" to {410, 200}" \
-#      -e "       set the bounds of the container window to {50, 100, 590, 500}" \
-#      -e "       update without registering applications" \
-#      -e "       delay 5 -- Sync" \
-#      -e "       close" \
-#      -e "   end tell" \
-#      -e "   -- Sync" \
-#      -e "   delay 5" \
-#      -e "end tell" || true # Make sure we don't make the build bots fail
 
 # Unmount the image now
        hdiutil detach "$(top_builddir)/vlcmnt/vlc-${VERSION}" ;
@@ -1108,7 +1095,9 @@ update-po:
          echo "# modules" ; \
          find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -name '*.ui' \
            | grep -v '\(\.moc\.\|gui/gtk2/\)' \
-           | grep -vE 'qt4/ui/.*.h' |grep -v 'qt4/resources.cpp\|qt4/dialogs/about.hpp' \
+           | grep -vE 'qt4/ui/.*.h' \
+           | grep -v 'qt4/resources.cpp\|qt4/dialogs/about.hpp' \
+           | grep -v 'gui/opie' \
            | sort ; \
        } > $(top_srcdir)/po/POTFILES.in
        rm -f $(top_srcdir)/po/vlc.pot