Mac OS X interface :

[vlc] / Makefile

diff --git a/Makefile b/Makefile
index 43375d05533d41bfe39a202374b1c3fdfc6cab59..469a6659faec86c5bf4c5434241d06b8c2de7251 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,9 @@
 ifeq ($(shell [ ! -r Makefile.opts ] && echo 1),)
     include Makefile.opts
 endif
+ifeq ($(shell [ ! -r Makefile.config ] && echo 1),)
+    include Makefile.config
+endif
 
 ###############################################################################
 # Objects and files
@@ -98,6 +101,7 @@ PLUGINS_TARGETS := a52/a52 \
                filter/filter_invert \
                filter/filter_distort \
                filter/filter_wall \
+               filter/filter_clone \
                fx/fx_scope \
                ggi/ggi \
                glide/glide \
@@ -128,6 +132,7 @@ PLUGINS_TARGETS := a52/a52 \
                motion/motionmmxext \
                motion/motion3dnow \
                motion/motionaltivec \
+        mpeg_system/mpeg_audio \
                mpeg_system/mpeg_es \
                mpeg_system/mpeg_ps \
                mpeg_system/mpeg_ts \
@@ -190,7 +195,7 @@ C_OBJ +=    src/misc/win32_specific.o
 RESOURCE_OBJ :=        share/vlc_win32_rc.o
 endif
 
-VLC_OBJ := $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ)
+VLC_OBJ := $(C_OBJ) $(CPP_OBJ) $(M_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ)
 
 #
 # Generated header
@@ -276,7 +281,7 @@ vlc-clean:
 distclean: clean
        -cd po && $(MAKE) maintainer-clean
        rm -f **/*.o **/*~ *.log
-       rm -f Makefile.opts
+       rm -f Makefile.opts Makefile.config
        rm -f include/defs.h include/modules_builtin.h
        rm -f src/misc/modules_builtin.h
        rm -f config*status config*cache config*log conftest*
@@ -343,8 +348,8 @@ dist:
        rm -Rf tmp/vlc/tmp
        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 '*.[bcdhigrst]*' | while read i ; \
+       # Copy .c .h .in .cpp .m and .glade files
+       find include src plugins -type f -name '*.[bcdhigmrst]*' | while read i ; \
                do cp $$i tmp/vlc/$$i ; done
        # Grmbl... special case...
        for i in API BUGS DESIGN TODO ; \
@@ -364,7 +369,7 @@ dist:
        # 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 \
+               Makefile Makefile.*.in Makefile.dep Makefile.modules \
                configure configure.in install-sh install-win32 macosx-dmg \
                config.sub config.guess aclocal.m4 mkinstalldirs \
                        tmp/vlc/
@@ -456,7 +461,7 @@ package-macosx:
 
        # Copy relevant files 
        cp -R vlc.app tmp/
-       cp AUTHORS COPYING ChangeLog README README\ -\ Mac\ OS\ X.rtf FAQ TODO tmp/
+       cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf FAQ TODO tmp/
 
        # Create disk image 
        ./macosx-dmg 0 "vlc-${VERSION}" tmp/* 
@@ -530,6 +535,12 @@ $(CPP_OBJ): %.o: .dep/%.dpp
 $(CPP_OBJ): %.o: %.cpp
        $(CC) $(CFLAGS) $(vlc_CFLAGS) -c -o $@ $<
 
+$(M_OBJ): %.o: Makefile.opts Makefile.dep Makefile
+$(M_OBJ): %.o: $(H_OBJ)
+$(M_OBJ): %.o: .dep/%.dm
+$(M_OBJ): %.o: %.m
+       $(CC) $(CFLAGS) $(vlc_CFLAGS) -c -o $@ $<
+
 $(RESOURCE_OBJ): %.o: Makefile.dep Makefile
 ifneq (,(findstring mingw32,$(SYS)))
 $(RESOURCE_OBJ): %.o: %.rc
@@ -539,7 +550,7 @@ endif
 #
 # Main application target
 #
-vlc: Makefile.opts Makefile.dep Makefile $(VLC_OBJ) $(BUILTIN_OBJ)
+vlc: Makefile.config Makefile.opts Makefile.dep Makefile $(VLC_OBJ) $(BUILTIN_OBJ)
        $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LDFLAGS) $(vlc_LDFLAGS) $(builtins_LDFLAGS)
 ifeq ($(SYS),beos)
        xres -o $@ ./share/vlc_beos.rsrc