]> git.sesse.net Git - vlc/blobdiff - Makefile
Documentation updates.
[vlc] / Makefile
index 6e41c550b8d1edc1e660051924ca8957896ed1a9..78df89177649be8eb17130a5bee2f781f922841d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,12 +13,82 @@ endif
 # 
 # All possible plugin directories, needed for make clean
 #
-PLUGINS_DIR := alsa beos darwin directx dsp dummy dvd esd fb ggi glide gtk downmix idct imdct kde macosx mga motion mpeg qt sdl text x11 yuv
+PLUGINS_DIR := alsa \
+               beos \
+               darwin \
+               directx \
+               dsp \
+               dummy \
+               dvd \
+               esd \
+               fb \
+               ggi \
+               glide \
+               gtk \
+               downmix \
+               idct \
+               imdct \
+               kde \
+               macosx \
+               mga \
+               motion \
+               mpeg \
+               qt \
+               sdl \
+               text \
+               vcd \
+               x11 \
+               yuv
 
 #
 # All possible plugin objects
 #
-PLUGINS_TARGETS := alsa/alsa beos/beos darwin/darwin directx/directx dsp/dsp dummy/dummy dummy/null dvd/dvd esd/esd fb/fb ggi/ggi glide/glide gtk/gnome gtk/gtk downmix/downmix downmix/downmixsse downmix/downmix3dn idct/idct idct/idctclassic idct/idctmmx idct/idctmmxext imdct/imdct imdct/imdct3dn imdct/imdctsse kde/kde macosx/macosx mga/mga motion/motion motion/motionmmx motion/motionmmxext mpeg/es mpeg/ps mpeg/ts qt/qt sdl/sdl text/ncurses text/rc x11/x11 x11/xvideo yuv/yuv yuv/yuvmmx
+PLUGINS_TARGETS := alsa/alsa \
+               beos/beos \
+               darwin/darwin \
+               directx/directx \
+               dsp/dsp \
+               dummy/dummy \
+               dummy/null \
+               dvd/dvd \
+               esd/esd \
+               fb/fb \
+               ggi/ggi \
+               glide/glide \
+               gtk/gnome \
+               gtk/gtk \
+               downmix/downmix \
+               downmix/downmixsse \
+               downmix/downmix3dn \
+               idct/idct \
+               idct/idctclassic \
+               idct/idctmmx \
+               idct/idctmmxext \
+               idct/idctaltivec \
+               imdct/imdct \
+               imdct/imdct3dn \
+               imdct/imdctsse \
+               kde/kde \
+               macosx/macosx \
+               macosx/macosx_qt \
+               mga/mga \
+               motion/motion \
+               motion/motionmmx \
+               motion/motionmmxext \
+               motion/motion3dnow \
+               motion/motionaltivec \
+               mpeg/es \
+               mpeg/ps \
+               mpeg/ts \
+               qt/qt \
+               sdl/sdl \
+               text/ncurses \
+               text/rc \
+               vcd/vcd \
+               x11/x11 \
+               x11/xvideo \
+               yuv/yuv \
+               yuv/yuvmmx
 
 #
 # C Objects
@@ -33,7 +103,7 @@ LPCM_DECODER := lpcm_decoder_thread
 AUDIO_DECODER := audio_decoder adec_generic adec_layer1 adec_layer2 adec_math
 SPU_DECODER := spu_decoder
 VIDEO_DECODER := video_parser vpar_headers vpar_blocks vpar_synchro vpar_pool video_decoder
-MISC := mtime tests modules netutils
+MISC := mtime tests modules netutils iso_lang
 
 C_OBJ :=       $(INTERFACE:%=src/interface/%.o) \
                $(INPUT:%=src/input/%.o) \
@@ -50,7 +120,7 @@ C_OBJ :=     $(INTERFACE:%=src/interface/%.o) \
 #
 # Misc Objects
 # 
-ifeq ($(GETOPT),1)
+ifeq ($(NEED_GETOPT),1)
 C_OBJ += extras/GNUgetopt/getopt.o extras/GNUgetopt/getopt1.o 
 endif
 
@@ -66,6 +136,8 @@ ifneq (,$(findstring mingw32,$(SYS)))
 RESOURCE_OBJ :=        share/vlc_win32_rc.o
 endif
 
+VLC_OBJ := $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ)
+
 #
 # Generated header
 #
@@ -90,8 +162,8 @@ endif
 #
 # Misc variables
 #
-VLC_QUICKVERSION := $(shell grep 'VLC_VERSION=' configure.in | cut -f2 -d=)
-LIBDVDCSS_QUICKVERSION := $(shell grep 'LIBDVDCSS_VERSION=' configure.in | cut -f2 -d=)
+VLC_QUICKVERSION := $(shell grep '^ *VLC_VERSION=' configure.in | cut -f2 -d=)
+LIBDVDCSS_QUICKVERSION := $(shell grep '^ *LIBDVDCSS_VERSION=' configure.in | cut -f2 -d=)
 
 
 # All symbols must be exported
@@ -109,17 +181,16 @@ all: Makefile.opts vlc ${ALIASES} vlc.app
 Makefile.opts:
        @echo "**** No configuration found, running ./configure..."
        ./configure
-
-# Include Makefile.opts again in case we just generated it
-ifneq (1,$(HAVE_MAKEFILE_OPTS))
-    -include Makefile.opts
-endif
+       $(MAKE) $(MAKECMDGOALS)
+       exit
 
 show:
        @echo CC: $(CC)
        @echo CFLAGS: $(CFLAGS)
        @echo DCFLAGS: $(DCFLAGS)
        @echo LCFLAGS: $(LCFLAGS)
+       @echo PCFLAGS: $(PCFLAGS)
+       @echo PLCFLAGS: $(PLCFLAGS)
        @echo C_OBJ: $(C_OBJ)
        @echo CPP_OBJ: $(CPP_OBJ)
        @echo PLUGIN_OBJ: $(PLUGIN_OBJ)
@@ -132,6 +203,7 @@ clean: libdvdcss-clean plugins-clean vlc-clean
        rm -f src/*/*.o extras/*/*.o
        rm -f lib/*.so* lib/*.a
        rm -f plugins/*.so plugins/*.a
+       rm -rf extras/MacOSX/build
 
 libdvdcss-clean:
        -cd extras/libdvdcss && $(MAKE) clean
@@ -175,7 +247,7 @@ endif
        $(INSTALL) -m 644 share/*.xpm $(DESTDIR)$(datadir)/videolan
 
 vlc-uninstall:
-       rm vlc $(DESTDIR)$(bindir)/vlc
+       rm -f $(DESTDIR)$(bindir)/vlc
 ifneq (,$(ALIASES))
        for alias in $(ALIASES) ; do if test $$alias ; then rm -f $(DESTDIR)$(bindir)/$$alias ; fi ; done
 endif
@@ -201,87 +273,125 @@ libdvdcss-uninstall:
 #
 # Package generation rules
 #
-snapshot-common: clean
-       rm -Rf /tmp/vlc
-       # Copy directory structure in /tmp
-       find -type d | grep -v CVS | grep -v '\.dep' | while read i ; \
-               do mkdir -p /tmp/vlc/$$i ; \
+snapshot-common:
+       # Check that tmp isn't in the way
+       @if test -e tmp; then \
+               echo "Error: please remove ./tmp, it is in the way"; false; \
+       else \
+               echo "OK."; mkdir tmp; \
+       fi
+       # Copy directory structure in tmp
+       find -type d | grep -v '\(\.dep\|snapshot\|CVS\)' | while read i ; \
+               do mkdir -p tmp/vlc/$$i ; \
        done
+       rm -Rf tmp/vlc/tmp
        find debian -mindepth 1 -maxdepth 1 -type d | \
-               while read i ; do rm -Rf /tmp/vlc/$$i ; done
+               while read i ; do rm -Rf tmp/vlc/$$i ; done
        # Copy .c .h .in .cpp and .glade files
        find include src plugins -type f -name '*.[chig]*' | while read i ; \
-               do cp $$i /tmp/vlc/$$i ; done
+               do cp $$i tmp/vlc/$$i ; done
        # Copy plugin Makefiles
        find plugins -type f -name Makefile | while read i ; \
-               do cp $$i /tmp/vlc/$$i ; done
+               do cp $$i tmp/vlc/$$i ; done
        # Copy extra programs and documentation
-       cp -a extras/* /tmp/vlc/extras
-       cp -a doc/* /tmp/vlc/doc
-       find /tmp/vlc/extras /tmp/vlc/doc \
-               -type d -name CVS -o -type f -name '.*' | while read i ; \
-                       do rm -Rf $$i ; done
+       cp -a extras/* tmp/vlc/extras
+       cp -a doc/* tmp/vlc/doc
+       find tmp/vlc/extras tmp/vlc/doc \
+               -type d -name CVS -o -name '.*' -o -name '*.[o]' | \
+                       while read i ; do rm -Rf $$i ; done
        # Copy misc files
-       cp vlc.spec AUTHORS COPYING TODO todo.pl ChangeLog README* INSTALL* \
+       cp vlc.spec AUTHORS COPYING TODO todo.pl ChangeLog* README* INSTALL* \
                Makefile Makefile.opts.in Makefile.dep Makefile.modules \
                configure configure.in install-sh config.sub config.guess \
-                       /tmp/vlc/
+                       tmp/vlc/
        # Copy Debian control files
-       for file in debian/*dirs debian/*menu debian/*desktop ; do \
-               cp $$file /tmp/vlc/debian ; done
-       for file in control changelog rules vlc.copyright vlc.docs ; do \
-               cp debian/$$file /tmp/vlc/debian/ ; done
+       for file in debian/*dirs debian/*docs debian/*menu debian/*desktop \
+               debian/*copyright ; do cp $$file tmp/vlc/debian ; done
+       for file in control changelog rules ; do \
+               cp debian/$$file tmp/vlc/debian/ ; done
        # Copy fonts and icons
        for file in share/*png share/*xpm share/*psf ; do \
-               cp $$file /tmp/vlc/share ; done
+               cp $$file tmp/vlc/share ; done
        for file in vlc_beos.rsrc vlc.icns gvlc_win32.ico vlc_win32_rc.rc ; do \
-                       cp share/$$file /tmp/vlc/share/ ; done
+                       cp share/$$file tmp/vlc/share/ ; done
 
 snapshot: snapshot-common
-       # Build archives and clean up
+       # Build archives
        F=vlc-${VLC_QUICKVERSION}; \
-       rm -Rf /tmp/$$F ; mv /tmp/vlc /tmp/$$F; \
-       (cd /tmp ; tar cf $$F.tar $$F ; bzip2 -f -9 < $$F.tar > $$F.tar.bz2; \
-               gzip -f -9 $$F.tar ); mv /tmp/$$F.tar.gz /tmp/$$F.tar.bz2 ..; \
-       rm -Rf /tmp/$$F
+       mv tmp/vlc tmp/$$F; (cd tmp ; tar cf $$F.tar $$F); \
+       bzip2 -f -9 < tmp/$$F.tar > $$F.tar.bz2; \
+       gzip -f -9 tmp/$$F.tar ; mv tmp/$$F.tar.gz .
+       # Clean up
+       rm -Rf tmp
 
 snapshot-nocss: snapshot-common
        # Remove libdvdcss
-       rm -Rf /tmp/vlc/extras/libdvdcss
-       rm -f /tmp/vlc/*.libdvdcss
+       rm -Rf tmp/vlc/extras/libdvdcss
+       rm -f tmp/vlc/*.libdvdcss
        # Fix debian information
-       rm -f /tmp/vlc/debian/libdvdcss*
-       rm -f /tmp/vlc/debian/control
+       rm -f tmp/vlc/debian/libdvdcss*
+       rm -f tmp/vlc/debian/control
        sed -e 's#^ DVDs# unencrypted DVDs#' < debian/control \
                | awk '{if(gsub("Package: libdvdcss",$$0))a=1;if(a==0)print $$0;if(a==1&&$$0=="")a=0}' \
-               > /tmp/vlc/debian/control
-       rm -f /tmp/vlc/debian/rules
+               > tmp/vlc/debian/control
+       rm -f tmp/vlc/debian/rules
        sed -e 's#^\(export LIBDVDCSS_FLAGS=\).*#\1"--without-dvdcss"#' < debian/rules \
                | awk '{if($$0=="# libdvdcss start")a=1;if(a==0)print $$0;if($$0=="# libdvdcss stop")a=0}' \
-               > /tmp/vlc/debian/rules
-       chmod +x /tmp/vlc/debian/rules
-       # Build css-disabled archives and clean up
+               > tmp/vlc/debian/rules
+       chmod +x tmp/vlc/debian/rules
+       # Build css-disabled archives
        F=vlc-${VLC_QUICKVERSION}; G=vlc-${VLC_QUICKVERSION}-nocss; \
-       rm -Rf /tmp/$$F ; mv /tmp/vlc /tmp/$$F; \
-       (cd /tmp ; tar cf $$G.tar $$F ; bzip2 -f -9 < $$G.tar > $$G.tar.bz2; \
-               gzip -f -9 $$G.tar ); mv /tmp/$$G.tar.gz /tmp/$$G.tar.bz2 ..; \
-       rm -Rf /tmp/$$F
+       mv tmp/vlc tmp/$$F; (cd tmp ; tar cf $$G.tar $$F); \
+       bzip2 -f -9 < tmp/$$G.tar > $$G.tar.bz2; \
+       gzip -f -9 tmp/$$G.tar ; mv tmp/$$G.tar.gz .
+       # Clean up
+       rm -Rf tmp
+
+package-win32:
+       # XXX: this rule is probably only useful to you if you have exactly
+       # the same setup as me. Contact sam@zoy.org if you need to use it.
+       #
+       # Check that tmp isn't in the way
+       @if test -e tmp; then \
+               echo "Error: please remove ./tmp, it is in the way"; false; \
+       else \
+               echo "OK."; mkdir tmp; \
+       fi
+       # Create installation script
+       sed -e 's#@VERSION@#'${VLC_QUICKVERSION}'#' < install-win32 > tmp/nsi
+       # Copy relevant files
+       cp vlc.exe plugins/directx.so plugins/gtk.so plugins/sdl.so tmp/ 
+       cp INSTALL-win32.txt AUTHORS COPYING ChangeLog ChangeLog.libdvdcss \
+               README README.libdvdcss FAQ TODO tmp/
+       for file in gtk-1.3.dll gdk-1.3.dll glib-1.3.dll gmodule-1.3.dll \
+               gnu-intl.dll SDL.dll README-SDL.txt ; \
+                       do cp ../vlc-win32/$$file tmp/ ; done
+       mkdir tmp/share
+       for file in default8x16.psf default8x9.psf ; \
+               do cp share/$$file tmp/share/ ; done
+       # Create package 
+       wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe /CD tmp/nsi
+       mv tmp/vlc-${VLC_QUICKVERSION}.exe \
+               vlc-${VLC_QUICKVERSION}-win32-installer.exe
+       # Clean up
+       rm -Rf tmp
 
 libdvdcss-snapshot: snapshot-common
        # Remove vlc sources and icons, doc, debian directory...
-       rm -Rf /tmp/vlc/src /tmp/vlc/share /tmp/vlc/plugins /tmp/vlc/doc
-       rm -Rf /tmp/vlc/extras/GNUgetopt /tmp/vlc/extras/MacOSX_app
-       rm -Rf /tmp/vlc/debian
+       rm -Rf tmp/vlc/src tmp/vlc/share tmp/vlc/plugins tmp/vlc/doc
+       rm -Rf tmp/vlc/extras/GNUgetopt tmp/vlc/extras/MacOSX
+       rm -Rf tmp/vlc/debian
        # Remove useless headers
-       rm -f /tmp/vlc/include/*
+       rm -f tmp/vlc/include/*
        for file in defs.h.in config.h.in common.h int_types.h ; \
-               do cp include/$$file /tmp/vlc/include/ ; done
+               do cp include/$$file tmp/vlc/include/ ; done
        # Remove misc files (??? - maybe not really needed)
-       rm -f /tmp/vlc/vlc.spec /tmp/vlc/INSTALL-win32.txt
-       mv /tmp/vlc/INSTALL.libdvdcss /tmp/vlc/INSTALL
-       mv /tmp/vlc/README.libdvdcss /tmp/vlc/README
+       rm -f tmp/vlc/vlc.spec tmp/vlc/INSTALL-win32.txt
+       mv tmp/vlc/INSTALL.libdvdcss tmp/vlc/INSTALL
+       mv tmp/vlc/README.libdvdcss tmp/vlc/README
+       mv tmp/vlc/ChangeLog.libdvdcss tmp/vlc/ChangeLog
        # Fix Makefile
-       rm -f /tmp/vlc/Makefile
+       rm -f tmp/vlc/Makefile
        sed -e 's#^install:#install-unused:#' \
                -e 's#^uninstall:#uninstall-unused:#' \
                -e 's#^clean:#clean-unused:#' \
@@ -289,13 +399,14 @@ libdvdcss-snapshot: snapshot-common
                -e 's#^libdvdcss-install:#install:#' \
                -e 's#^libdvdcss-uninstall:#uninstall:#' \
                -e 's#^libdvdcss-clean:#clean:#' \
-               < Makefile > /tmp/vlc/Makefile
-       # Build archives and clean up
+               < Makefile > tmp/vlc/Makefile
+       # Build archives
        F=libdvdcss-${LIBDVDCSS_QUICKVERSION}; \
-       rm -Rf /tmp/$$F ; mv /tmp/vlc /tmp/$$F; \
-       (cd /tmp ; tar cf $$F.tar $$F ; bzip2 -f -9 < $$F.tar > $$F.tar.bz2; \
-               gzip -f -9 $$F.tar ); mv /tmp/$$F.tar.gz /tmp/$$F.tar.bz2 ..; \
-       rm -Rf /tmp/$$F
+       mv tmp/vlc tmp/$$F; (cd tmp ; tar cf $$F.tar $$F); \
+       bzip2 -f -9 < tmp/$$F.tar > $$F.tar.bz2; \
+       gzip -f -9 tmp/$$F.tar ; mv tmp/$$F.tar.gz .
+       # Clean up
+       rm -Rf tmp
 
 deb:
        dpkg-buildpackage -rfakeroot -us -uc
@@ -310,13 +421,11 @@ gnome-vlc gvlc kvlc qvlc: vlc
 vlc.app: Makefile.opts
 ifneq (,$(findstring darwin,$(SYS)))
        rm -Rf vlc.app
-       mkdir -p vlc.app/Contents/Resources
-       mkdir -p vlc.app/Contents/MacOS/lib
-       mkdir -p vlc.app/Contents/MacOS/share
-       $(INSTALL) -m 644 extras/MacOSX_app/Contents/Info.plist vlc.app/Contents/
-       $(INSTALL) -m 644 extras/MacOSX_app/Contents/PkgInfo vlc.app/Contents/
+       cd extras/MacOSX ; pbxbuild | grep -v '^ ' | grep -v '^\t'
+       cp -r extras/MacOSX/build/vlc.bundle ./vlc.app
+       $(INSTALL) -d vlc vlc.app/Contents/MacOS/share
+       $(INSTALL) -d vlc vlc.app/Contents/MacOS/plugins
        $(INSTALL) vlc vlc.app/Contents/MacOS/
-       $(INSTALL) share/vlc.icns vlc.app/Contents/Resources/
 ifneq (,$(PLUGINS))
        $(INSTALL) $(PLUGINS:%=plugins/%.so) vlc.app/Contents/MacOS/plugins
 endif
@@ -370,8 +479,8 @@ endif
 #
 # Main application target
 #
-vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ) plugins
-       $(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ) $(LCFLAGS)
+vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(VLC_OBJ) $(BUILTIN_OBJ) plugins
+       $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LCFLAGS)
 ifeq ($(SYS),beos)
        xres -o $@ ./share/vlc_beos.rsrc
        mimeset -f $@
@@ -396,4 +505,3 @@ $(BUILTIN_OBJ): FORCE
 #
 libdvdcss: Makefile.opts
        cd extras/libdvdcss && $(MAKE)
-