]> git.sesse.net Git - vlc/blobdiff - Makefile.am
loader: fix a warning
[vlc] / Makefile.am
index 244151cd34d2b188ee3d1995026391e2b7363be5..d12dea31aff8829771db884b12e1d51fd6101819 100644 (file)
@@ -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 $@
+
+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
 
-# 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
+nvlc: make-alias
+       $(MKALIAS) ncurses
 
 if HAVE_DARWIN
 # Create the MacOS X app
@@ -333,10 +351,11 @@ VLC-release.app: vlc
          echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \
          false; \
        else \
-         echo "OK."; mkdir -p "$(top_builddir)/tmp/extras"; \
+         echo "OK."; mkdir -p "$(top_builddir)/tmp/extras/MacOSX"; \
        fi
        rm -Rf $(top_builddir)/VLC-release.app
-       cp -R $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras
+       cp -R $(srcdir)/extras/MacOSX/vlc.xcodeproj $(top_builddir)/tmp/extras/MacOSX/
+       cp -R $(srcdir)/extras/MacOSX/Resources $(top_builddir)/tmp/extras/MacOSX
        for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \
          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
        done
@@ -448,6 +467,7 @@ VLC-release.app: vlc
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/vlm
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/images
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests
+       $(INSTALL) -m 644 $(srcdir)/share/http-lua/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/.hosts
        for i in $(srcdir)/share/http-lua/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/`basename $${i}` ; \
        done ; \
@@ -480,6 +500,8 @@ VLC-release.app: vlc
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests
+       $(INSTALL) -m 644 $(srcdir)/share/http/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/.hosts
+       $(INSTALL) -m 644 $(srcdir)/share/http/old/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/.hosts
        for i in $(srcdir)/share/http/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \
        done ; \
@@ -524,10 +546,11 @@ VLC.app: vlc
          echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \
          false; \
        else \
-         echo "OK."; mkdir -p "$(top_builddir)/tmp/extras"; \
+         echo "OK."; mkdir -p "$(top_builddir)/tmp/extras/MacOSX"; \
        fi
        rm -Rf $(top_builddir)/VLC.app
-       cp -R $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras
+       cp -R $(srcdir)/extras/MacOSX/vlc.xcodeproj $(top_builddir)/tmp/extras/MacOSX/
+       cp -R $(srcdir)/extras/MacOSX/Resources $(top_builddir)/tmp/extras/MacOSX
        for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \
          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
        done
@@ -948,10 +971,6 @@ package-macosx:
        echo "Create package directory: vlc-${VERSION}/";
        mkdir -p "$(top_builddir)/vlc-${VERSION}/";
 
-# For now, export the framework for third parties, from here
-       (cd $(top_builddir)/extras/MacOSX/Framework && xcodebuild);
-       cp -r $(top_builddir)/extras/MacOSX/Framework/build/Release/VLC.framework $(top_builddir)/vlc-${VERSION}/VLC.framework
-
 # Copy relevant files 
        @if test -e "$(top_builddir)/VLC-release.app/"; then \
          cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \
@@ -968,26 +987,34 @@ package-macosx:
 # Place a link to the application folder
        ln -s /Applications $(top_builddir)/vlc-${VERSION}/Applications ;
 
-# Create disk image 
+# Create disk image (temporarily taken from the 0.8.6-bugfix branch to provide reliable NBs)
        echo "Creating disk image" ;
        rm -f "$(top_builddir)/vlc-${VERSION}.dmg" ;
-       hdiutil create -srcfolder "$(top_builddir)/vlc-${VERSION}" \
-         "$(top_builddir)/vlc-${VERSION}.dmg" -format UDRW \
-         -scrub -imagekey zlib-level=9 ;
+       hdiutil create -verbose -srcfolder "$(top_builddir)/vlc-${VERSION}" \
+         "$(top_builddir)/vlc-${VERSION}.dmg" -scrub ;
+       echo "Disk image creation completed:" ;
+       ls -la "$(top_builddir)/vlc-${VERSION}.dmg" ; echo ;
+
+# Create disk image 
+#      echo "Creating disk image" ;
+#      rm -f "$(top_builddir)/vlc-${VERSION}.dmg" ;
+#      hdiutil create -verbose -srcfolder "$(top_builddir)/vlc-${VERSION}" \
+#        "$(top_builddir)/vlc-${VERSION}.dmg" -format UDRW \
+#        -scrub -imagekey zlib-level=9 -attach ;
 
 # Make sure the root window of the dmg will pop up when the dmg is mounted.
 # Note: We dont mount in /Volumes to be sure we won't collide with an other
 # finder mounted dmg with the same name.
-       echo "Make sure the root window of the dmg will pop up when the dmg is mounted" ;
-       mkdir -p $(top_builddir)/vlcmnt ;
-       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
-       cd "$(srcdir)"
+#      echo "Make sure the root window of the dmg will pop up when the dmg is mounted" ;
+#      mkdir -p $(top_builddir)/vlcmnt ;
+#      hdiutil attach -nokernel -readwrite -noverify -noautoopen -private "$(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
+#      cd "$(srcdir)"
 
 # Unmount the image now
-       hdiutil detach "$(top_builddir)/vlcmnt/vlc-${VERSION}" ;
-       rm -R $(top_builddir)/vlcmnt ;
+#      hdiutil detach "$(top_builddir)/vlcmnt/vlc-${VERSION}" ;
+#      rm -R $(top_builddir)/vlcmnt ;
 
 # Make sure the image is not writable
 # Note: We can't directly create a read only dmg as we do the bless stuff