* ./plugins/gtk/gnome.c, ./plugins/gtk/gtk.c, ./plugins/gtk/gtk_display.*:

[vlc] / Makefile

diff --git a/Makefile b/Makefile
index 95d42e3b82cb0abc88c810cfb7f33244e6ea4304..43375d05533d41bfe39a202374b1c3fdfc6cab59 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@ PLUGINS_DIR :=        a52 \
                access \
                alsa \
                arts \
+               avi \
                beos \
                chroma \
                directx \
@@ -30,6 +31,7 @@ PLUGINS_DIR :=        a52 \
                dvdread \
                esd \
                fb \
+               ffmpeg \
                filter \
                fx \
                ggi \
@@ -69,6 +71,7 @@ PLUGINS_TARGETS := a52/a52 \
                access/http \
                alsa/alsa \
                arts/arts \
+               avi/avi \
                beos/beos \
                chroma/chroma_i420_rgb \
                chroma/chroma_i420_rgb_mmx \
@@ -89,6 +92,7 @@ PLUGINS_TARGETS := a52/a52 \
                dvdread/dvdread \
                esd/esd \
                fb/fb \
+               ffmpeg/ffmpeg \
                filter/filter_deinterlace \
                filter/filter_transform \
                filter/filter_invert \
@@ -127,6 +131,7 @@ PLUGINS_TARGETS := a52/a52 \
                mpeg_system/mpeg_es \
                mpeg_system/mpeg_ps \
                mpeg_system/mpeg_ts \
+               mpeg_system/mpeg_ts_dvbpsi \
                mpeg_adec/mpeg_adec \
                mpeg_vdec/mpeg_vdec \
                network/ipv4 \
@@ -274,7 +279,7 @@ distclean: clean
        rm -f Makefile.opts
        rm -f include/defs.h include/modules_builtin.h
        rm -f src/misc/modules_builtin.h
-       rm -f config*status config*cache config*log
+       rm -f config*status config*cache config*log conftest*
        rm -f gmon.out core build-stamp
        rm -Rf .dep
        rm -f .gdb_history
@@ -339,8 +344,11 @@ dist:
        find debian -mindepth 1 -maxdepth 1 -type d | \
                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 ; \
+       find include src plugins -type f -name '*.[bcdhigrst]*' | while read i ; \
                do cp $$i tmp/vlc/$$i ; done
+       # Grmbl... special case...
+       for i in API BUGS DESIGN TODO ; \
+               do cp plugins/mad/$$i tmp/vlc/plugins/mad ; done
        # Copy plugin Makefiles
        find plugins -type f -name Makefile | while read i ; \
                do cp $$i tmp/vlc/$$i ; done
@@ -351,12 +359,13 @@ dist:
                -type d -name CVS -o -name '.*' -o -name '*.[o]' | \
                        while read i ; do rm -Rf $$i ; done
        # Copy gettext stuff
-       cp po/*.po tmp/vlc/po
+       cp po/ChangeLog po/vlc.pot po/*.po tmp/vlc/po
        for i in Makefile.in.in POTFILES.in ; do cp po/$$i tmp/vlc/po ; done
        # Copy misc files
        cp FAQ AUTHORS COPYING TODO todo.pl ChangeLog* README* INSTALL* \
+               ABOUT-NLS BUGS MODULES vlc.spec \
                Makefile Makefile.opts.in Makefile.dep Makefile.modules \
-               configure configure.in install-sh install-win32 vlc.spec \
+               configure configure.in install-sh install-win32 macosx-dmg \
                config.sub config.guess aclocal.m4 mkinstalldirs \
                        tmp/vlc/
        # Copy Debian control files
@@ -365,18 +374,14 @@ dist:
        for file in control changelog rules ; do \
                cp debian/$$file tmp/vlc/debian/ ; done
        # Copy ipkg control files
-       for file in control rules ; do \
+       for file in control rules patch ; do \
                cp ipkg/$$file tmp/vlc/ipkg/ ; done
        # Copy fonts and icons
-       for file in share/*png share/*xpm share/*psf ; do \
+       for file in share/*vlc* share/*psf; do \
                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
        # Build archives
        F=vlc-${VERSION}; \
-       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 .
+       mv tmp/vlc tmp/$$F; (cd tmp ; tar czf ../$$F.tar.gz $$F); \
        # Clean up
        rm -Rf tmp
 
@@ -401,7 +406,11 @@ package-win32:
                        unix2dos tmp/$${file}.txt ; done
        mkdir tmp/plugins
        cp $(PLUGINS:%=plugins/%.so) tmp/plugins/ 
-       $(STRIP) tmp/$(PLUGINS:%=plugins/%.so)
+       # don't include these two
+       #rm -f tmp/plugins/gtk.so tmp/plugins/sdl.so
+ifneq (,$(PLUGINS))
+       for i in $(PLUGINS) ; do if test $$i != intfwin ; then $(STRIP) tmp/plugins/$$i.so ; fi ; done
+endif
        mkdir tmp/share
        for file in default8x16.psf default8x9.psf ; \
                do cp share/$$file tmp/share/ ; done
@@ -422,13 +431,17 @@ package-beos:
        mkdir -p tmp/vlc/share
        # Copy relevant files
        cp vlc tmp/vlc/
+       strip tmp/vlc/vlc
        cp AUTHORS COPYING ChangeLog README FAQ TODO tmp/vlc/
        for file in default8x16.psf default8x9.psf ; \
                do cp share/$$file tmp/vlc/share/ ; done
+       mkdir tmp/vlc/plugins
+       cp $(PLUGINS:%=plugins/%.so) tmp/vlc/plugins/ 
+       strip $(PLUGINS:%=tmp/vlc/plugins/%.so)
        # Create package 
        mv tmp/vlc tmp/vlc-${VERSION}
        (cd tmp ; find vlc-${VERSION} | \
-       zip -9 -@ vlc-${VERSION}-beos.zip )
+       zip -9 -@ vlc-${VERSION}-BeOS-x86.zip )
        mv tmp/vlc-${VERSION}-BeOS-x86.zip .
        # Clean up
        rm -Rf tmp
@@ -443,7 +456,7 @@ package-macosx:
 
        # Copy relevant files 
        cp -R vlc.app tmp/
-       cp AUTHORS COPYING ChangeLog README FAQ TODO tmp/
+       cp AUTHORS COPYING ChangeLog README README\ -\ Mac\ OS\ X.rtf FAQ TODO tmp/
 
        # Create disk image 
        ./macosx-dmg 0 "vlc-${VERSION}" tmp/* 
@@ -461,7 +474,7 @@ gnome-vlc gvlc kvlc qvlc: vlc
 vlc.app: vlc plugins
 ifneq (,$(findstring darwin,$(SYS)))
        rm -Rf vlc.app
-       cd extras/MacOSX ; pbxbuild | grep -v '^ ' | grep -v '^\t'
+       cd extras/MacOSX ; pbxbuild | grep -v '^ ' | grep -v '^\t' | grep -v "^$$"
        cp -r extras/MacOSX/build/vlc.bundle ./vlc.app
        $(INSTALL) -d vlc.app/Contents/MacOS/share
        $(INSTALL) -d vlc.app/Contents/MacOS/plugins
@@ -509,13 +522,13 @@ $(C_OBJ): %.o: Makefile.opts Makefile.dep Makefile
 $(C_OBJ): %.o: $(H_OBJ)
 $(C_OBJ): %.o: .dep/%.d
 $(C_OBJ): %.o: %.c
-       $(CC) $(CFLAGS) $(CFLAGS_VLC) -c -o $@ $<
+       $(CC) $(CFLAGS) $(vlc_CFLAGS) -c -o $@ $<
 
 $(CPP_OBJ): %.o: Makefile.opts Makefile.dep Makefile
 $(CPP_OBJ): %.o: $(H_OBJ)
 $(CPP_OBJ): %.o: .dep/%.dpp
 $(CPP_OBJ): %.o: %.cpp
-       $(CC) $(CFLAGS) $(CFLAGS_VLC) -c -o $@ $<
+       $(CC) $(CFLAGS) $(vlc_CFLAGS) -c -o $@ $<
 
 $(RESOURCE_OBJ): %.o: Makefile.dep Makefile
 ifneq (,(findstring mingw32,$(SYS)))