* Added .cvsignore files in the plugins directories.

[vlc] / plugins / macosx / Makefile

diff --git a/plugins/macosx/Makefile b/plugins/macosx/Makefile
index 4c219cbed59515e3b57f8597a96035d0b9cc50a7..8dac0a013e39c42fb7f3e2c8c0cc823d9bf77bb5 100644 (file)
--- a/plugins/macosx/Makefile
+++ b/plugins/macosx/Makefile
@@ -3,51 +3,37 @@
 # (c)2001 VideoLAN
 ###############################################################################
 
-include ../../Makefile.modules
+-include ../../Makefile.modules
+
+#
+# Objects
+#
 
-###############################################################################
-# Objects and files
-###############################################################################
 PLUGIN_MACOSX = macosx.o intf_macosx.o aout_macosx.o vout_macosx.o
-BUILTIN_MACOSX = $(PLUGIN_MACOSX:%.o=%-BUILTIN.o)
+BUILTIN_MACOSX = $(PLUGIN_MACOSX:%.o=BUILTIN_%.o)
 
 ALL_OBJ = $(PLUGIN_MACOSX) $(BUILTIN_MACOSX)
 
-objects := $(PLUGIN_MACOSX) $(BUILTIN_MACOSX)
-cdependancies := $(objects:%.o=.dep/%.d)
-
-export
-
 #
 # Virtual targets
 #
-all:
-
-clean:
-       rm -f $(ALL_OBJ)
-       rm -f *.o *.moc *.bak *.builtin
-       rm -rf .dep
-
-FORCE:
 
-$(cdependancies): %.d: FORCE
-       @$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
-
-$(ALL_OBJ): %.o: ../../Makefile.dep Makefile
+include ../../Makefile.common
 
 $(PLUGIN_MACOSX): %.o: .dep/%.d
 $(PLUGIN_MACOSX): %.o: %.c
        $(CC) $(CFLAGS) $(PCFLAGS) -fpascal-strings -c -o $@ $<
 
-$(BUILTIN_MACOSX): %-BUILTIN.o: .dep/%.d
-$(BUILTIN_MACOSX): %-BUILTIN.o: %.c
+$(BUILTIN_MACOSX): BUILTIN_%.o: .dep/%.d
+$(BUILTIN_MACOSX): BUILTIN_%.o: %.c
        $(CC) $(CFLAGS) -DBUILTIN -fpascal-strings -c -o $@ $<
 
 #
 # Real targets
 #
+
 ../../lib/macosx.so: $(PLUGIN_MACOSX)
-       $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -framework CoreAudio -framework Carbon -framework AGL
+       $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_MACOSX)
 
 ../../lib/macosx.a: $(BUILTIN_MACOSX)
        ar r $@ $^