Some heavy changes today:

[vlc] / plugins / gtk / Makefile

diff --git a/plugins/gtk/Makefile b/plugins/gtk/Makefile
index cff4121cc54c30b6655e6ba53d2843ec2b6118b8..0918a99db0f74a1a0d23ebcd0e1bba5befd1f824 100644 (file)
--- a/plugins/gtk/Makefile
+++ b/plugins/gtk/Makefile
@@ -1,71 +1,4 @@
-###############################################################################
-# vlc (VideoLAN Client) gtk/gnome module Makefile
-# (c)2001 VideoLAN
-###############################################################################
-
-#
-# Objects
-#
-
-PLUGIN_GTK = gtk.o intf_gtk.o gtk_interface.o gtk_support.o
-PLUGIN_GNOME = gnome.o intf_gnome.o gnome_interface.o gnome_support.o gnome_callbacks.o
-
-PLUGIN_GTK_SPECIFIC = gtk_display.o gtk_open.o gtk_control.o gtk_menu.o gtk_playlist.o gtk_modules.o gtk_preferences.o gtk_callbacks.o
-PLUGIN_GNOME_SPECIFIC = $(PLUGIN_GTK_SPECIFIC:%.o=%_gnome.o)
-
-BUILTIN_GTK = $(PLUGIN_GTK:%.o=BUILTIN_GTK_%.o) \
-        $(PLUGIN_GTK_SPECIFIC:%.o=BUILTIN_GTK_%.o)
-BUILTIN_GNOME = $(PLUGIN_GNOME:%.o=BUILTIN_GNOME_%.o) \
-        $(PLUGIN_GTK_SPECIFIC:%.o=BUILTIN_GNOME_%.o)
-
-ALL_OBJ = $(PLUGIN_GTK) $(PLUGIN_GNOME) $(PLUGIN_GTK_SPECIFIC) \
-          $(PLUGIN_GNOME_SPECIFIC) $(BUILTIN_GTK) $(BUILTIN_GNOME)
-
-#
-# Virtual targets
-#
-
-include ../../Makefile.modules
-
-# Gtk+
-$(PLUGIN_GTK) $(PLUGIN_GTK_SPECIFIC): %.o: .dep/%.d
-$(PLUGIN_GTK) $(PLUGIN_GTK_SPECIFIC): %.o: %.c
-       $(CC) $(CFLAGS) $(PCFLAGS) $(CFLAGS_GTK) -DPLUGIN -DMODULE_NAME=gtk -c -o $@ $<
-
-$(BUILTIN_GTK): BUILTIN_GTK_%.o: .dep/%.d
-$(BUILTIN_GTK): BUILTIN_GTK_%.o: %.c
-       $(CC) $(CFLAGS) $(CFLAGS_GTK) -DBUILTIN -DMODULE_NAME=gtk -c -o $@ $<
-
-# Gnome
-$(PLUGIN_GNOME): %.o: .dep/%.d
-$(PLUGIN_GNOME): %.o: %.c
-       $(CC) $(CFLAGS) $(PCFLAGS) -DPLUGIN -DMODULE_NAME=gnome `gnome-config --cflags gtk gnomeui` -c -o $@ $<
-
-$(PLUGIN_GNOME_SPECIFIC): %_gnome.o: .dep/%.d
-$(PLUGIN_GNOME_SPECIFIC): %_gnome.o: %.c
-       $(CC) $(CFLAGS) $(PCFLAGS) -DPLUGIN -DMODULE_NAME=gnome `gnome-config --cflags gtk gnomeui` -c -o $@ $<
-
-$(BUILTIN_GNOME): BUILTIN_GNOME_%.o: .dep/%.d
-$(BUILTIN_GNOME): BUILTIN_GNOME_%.o: %.c
-       $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=gnome `gnome-config --cflags gtk gnomeui` -c -o $@ $<
-
-
-#
-# Real targets
-#
-
-../gtk.so: $(PLUGIN_GTK) $(PLUGIN_GTK_SPECIFIC)
-       $(CC) -o $@ $^ $(PLCFLAGS) $(LIB_GTK)
-
-../gtk.a: $(BUILTIN_GTK)
-       ar r $@ $^
-       $(RANLIB) $@
-
-
-../gnome.so: $(PLUGIN_GNOME) $(PLUGIN_GNOME_SPECIFIC)
-       $(CC) -o $@ $^ $(PLCFLAGS) $(LIB_GNOME)
-
-../gnome.a: $(BUILTIN_GNOME)
-       ar r $@ $^
-       $(RANLIB) $@
+COMMON_SOURCES = gtk_display.c gtk_open.c gtk_control.c gtk_menu.c gtk_playlist.c gtk_modules.c gtk_preferences.c gtk_callbacks.c
 
+gtk_SOURCES = gtk.c gtk_interface.c gtk_support.c $(COMMON_SOURCES)
+gnome_SOURCES = gnome.c gnome_interface.c gnome_support.c gnome_callbacks.c $(COMMON_SOURCES)