* Fixed the BeOS compile typo.

[vlc] / plugins / gtk / Makefile

diff --git a/plugins/gtk/Makefile b/plugins/gtk/Makefile
index 522ad3c8b84b5b1701084b019071779ff555fa4d..03b4a6517295fa52ed5684f4e86f3fdc2753427b 100644 (file)
--- a/plugins/gtk/Makefile
+++ b/plugins/gtk/Makefile
@@ -1,54 +1,67 @@
 ###############################################################################
-# vlc (VideoLAN Client) gtk module Makefile
+# vlc (VideoLAN Client) gtk/gnome module Makefile
 # (c)2001 VideoLAN
 ###############################################################################
 
-include ../../Makefile.modules
-
-###############################################################################
-# Objects and files
-###############################################################################
-PLUGIN_GTK = gtk.o intf_gtk.o gtk_callbacks.o gtk_interface.o gtk_support.o gtk_playlist.o
-BUILTIN_GTK = $(PLUGIN_GTK:%.o=%-BUILTIN.o)
+#
+# Objects
+#
 
-ALL_OBJ = $(PLUGIN_GTK) $(BUILTIN_GTK)
+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_GTKCOMMON = gtk_display.o gtk_callbacks.o gtk_open.o gtk_control.o gtk_menu.o gtk_playlist.o gtk_modules.o gtk_preferences.o
 
-objects := $(PLUGIN_GTK) $(BUILTIN_GTK)
-cdependancies := $(objects:%.o=.dep/%.d)
+BUILTIN_GTK = $(PLUGIN_GTK:%.o=BUILTIN_GTK_%.o) \
+        $(PLUGIN_GTKCOMMON:%.o=BUILTIN_GTK_%.o)
+BUILTIN_GNOME = $(PLUGIN_GNOME:%.o=BUILTIN_GNOME_%.o) \
+        $(PLUGIN_GTKCOMMON:%.o=BUILTIN_GNOME_%.o)
 
-export
+ALL_OBJ = $(PLUGIN_GTK) $(PLUGIN_GNOME) $(PLUGIN_GTKCOMMON) \
+          $(BUILTIN_GTK) $(BUILTIN_GNOME)
 
 #
 # 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 $@
+include ../../Makefile.modules
 
-$(ALL_OBJ): %.o: ../../Makefile.dep Makefile
+$(PLUGIN_GTKCOMMON): %.o: .dep/%.d
+$(PLUGIN_GTKCOMMON): %.o: %.c
+       $(CC) $(CFLAGS) $(PCFLAGS) $(CFLAGS_GTK) -DPLUGIN -c -o $@ $<
 
 $(PLUGIN_GTK): %.o: .dep/%.d
 $(PLUGIN_GTK): %.o: %.c
-       $(CC) $(CFLAGS) $(PCFLAGS) `gtk-config --cflags gtk` -c -o $@ $<
+       $(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 $@ $<
+
+$(PLUGIN_GNOME): %.o: .dep/%.d
+$(PLUGIN_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 $@ $<
 
-$(BUILTIN_GTK): %-BUILTIN.o: .dep/%.d
-$(BUILTIN_GTK): %-BUILTIN.o: %.c
-       $(CC) $(CFLAGS) -DBUILTIN `gtk-config --cflags gtk` -c -o $@ $<
 
 #
 # Real targets
 #
-../../lib/gtk.so: $(PLUGIN_GTK)
-       $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) `gtk-config --libs gtk | sed 's,-rdynamic,,'`
+
+../../lib/gtk.so: $(PLUGIN_GTK) $(PLUGIN_GTKCOMMON)
+       $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GTK)
 
 ../../lib/gtk.a: $(BUILTIN_GTK)
        ar r $@ $^
+       $(RANLIB) $@
+
+
+../../lib/gnome.so: $(PLUGIN_GNOME) $(PLUGIN_GTKCOMMON)
+       $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_GNOME)
+
+../../lib/gnome.a: $(BUILTIN_GNOME)
+       ar r $@ $^
+       $(RANLIB) $@