* plugins/satellite/input_satellite.c: cosmetic changes in error messages

[vlc] / Makefile

diff --git a/Makefile b/Makefile
index 43375d05533d41bfe39a202374b1c3fdfc6cab59..b0b8b1580425f97f6183a3241b2768afd7841bc3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -98,6 +98,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 +129,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 +192,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
@@ -343,8 +345,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 ; \
@@ -456,7 +458,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 +532,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