New interface for MacOS X, courtesy of Florian G. Pflug.

[vlc] / plugins / macosx / Makefile

diff --git a/plugins/macosx/Makefile b/plugins/macosx/Makefile
index 994f3f4ab685779ffe044b1c45196dcb8b192c6e..dc9554540c4691c041a1c3044e42b3c84d81f4f8 100644 (file)
--- a/plugins/macosx/Makefile
+++ b/plugins/macosx/Makefile
@@ -7,16 +7,10 @@
 # Objects
 #
 
-PLUGIN_MACOSX = macosx.o intf_macosx.o vout_macosx.o
-PLUGIN_MACOSXQT = macosx_qt.o intf_macosx_qt.o vout_macosx_qt.o
-PLUGIN_MACOSXCOMMON = aout_macosx.o
+PLUGIN_MACOSX = macosx.o intf_main.o intf_controller.o aout_macosx.o vout_macosx.o intf_vlc_wrapper.o intf_qdview.o
+BUILTIN_MACOSX = $(PLUGIN_MACOSX:%.o=BUILTIN_%.o)
 
-BUILTIN_MACOSX = $(PLUGIN_MACOSX:%.o=BUILTIN_MACOSX_%.o) \
-               $(PLUGIN_MACOSXCOMMON:%.o=BUILTIN_MACOSX_%.o)
-BUILTIN_MACOSXQT = $(PLUGIN_MACOSXQT:%.o=BUILTIN_MACOSXQT_%.o)  \
-               $(PLUGIN_MACOSXCOMMON:%.o=BUILTIN_MACOSXQT_%.o)
-
-ALL_OBJ = $(PLUGIN_MACOSX) $(BUILTIN_MACOSX) $(PLUGIN_MACOSXQT) $(BUILTIN_MACOSXQT) $(PLUGIN_MACOSXCOMMON)
+ALL_OBJ = $(PLUGIN_MACOSX) $(BUILTIN_MACOSX)
 
 #
 # Virtual targets
@@ -24,33 +18,22 @@ ALL_OBJ = $(PLUGIN_MACOSX) $(BUILTIN_MACOSX) $(PLUGIN_MACOSXQT) $(BUILTIN_MACOSX
 
 include ../../Makefile.modules
 
-$(PLUGIN_MACOSX) $(PLUGIN_MACOSXQT) $(PLUGIN_MACOSXCOMMON): %.o: .dep/%.d
+$(PLUGIN_MACOSX): %.o: .dep/%.d
 $(PLUGIN_MACOSX): %.o: %.c
-       $(CC) $(CFLAGS) $(PCFLAGS) -fpascal-strings -c -o $@ $<
-
-$(BUILTIN_MACOSX): BUILTIN_MACOSX_%.o: .dep/%.d
-$(BUILTIN_MACOSX): BUILTIN_MACOSX_%.o: %.c
-       $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=macosx -fpascal-strings -c -o $@ $<
+       $(CC) $(CFLAGS) $(PCFLAGS) -ObjC -c -o $@ $<
 
-$(BUILTIN_MACOSXQT): BUILTIN_MACOSXQT_%.o: .dep/%.d
-$(BUILTIN_MACOSXQT): BUILTIN_MACOSXQT_%.o: %.c
-       $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=macosx_qt -fpascal-strings -c -o $@ $<
+$(BUILTIN_MACOSX): BUILTIN_%.o: .dep/%.d
+$(BUILTIN_MACOSX): BUILTIN_%.o: %.c
+       $(CC) $(CFLAGS) -DBUILTIN -ObjC -c -o $@ $<
 
 #
 # Real targets
 #
 
-../macosx.so: $(PLUGIN_MACOSX) $(PLUGIN_MACOSXCOMMON)
-       $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_MACOSX)
+../macosx.so: $(PLUGIN_MACOSX)
+       $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_MACOSX) -lobjc
 
 ../macosx.a: $(BUILTIN_MACOSX)
        ar r $@ $^
        $(RANLIB) $@
 
-../macosx_qt.so: $(PLUGIN_MACOSXQT) $(PLUGIN_MACOSXCOMMON)
-       $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_MACOSX)
-
-../macosx_qt.a: $(BUILTIN_MACOSXQT)
-       ar r $@ $^
-       $(RANLIB) $@
-