(note: empty CVS mails mean that a new directory has been created,

[vlc] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 3d0628cc6ea18b3572af82cc8711c6800e00de0b..855f40f11fef9cedeef1a12e2b716679496b6631 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,6 +19,7 @@ PLUGINS=@PLUGINS@
 INSTALL=@INSTALL@
 ARCH=@ARCH@
 
+exec_prefix=@exec_prefix@
 prefix=@prefix@
 bindir=@bindir@
 datadir=@datadir@
@@ -217,7 +218,8 @@ AC3_DECODER =       src/ac3_decoder/ac3_decoder_thread.o \
                src/ac3_decoder/ac3_mantissa.o \
                src/ac3_decoder/ac3_rematrix.o \
                src/ac3_decoder/ac3_imdct.o \
-               src/ac3_decoder/ac3_downmix.o
+               src/ac3_decoder/ac3_downmix.o \
+               src/ac3_decoder/ac3_downmix_c.o
 
 LPCM_DECODER = src/lpcm_decoder/lpcm_decoder_thread.o \
                src/lpcm_decoder/lpcm_decoder.o
@@ -298,9 +300,10 @@ PLUGIN_DUMMY =     plugins/dummy/dummy.o \
 
 PLUGIN_DVD =   plugins/dvd/dvd.o \
                plugins/dvd/input_dvd.o \
+               plugins/dvd/dvd_ioctl.o \
                plugins/dvd/dvd_ifo.o \
                plugins/dvd/dvd_udf.o \
-               plugins/dvd/dvd_css.o
+               plugins/dvd/dvd_css.o
 
 PLUGIN_ESD =   plugins/esd/esd.o \
                plugins/esd/aout_esd.o
@@ -312,15 +315,24 @@ PLUGIN_GGI =      plugins/ggi/ggi.o \
                plugins/ggi/vout_ggi.o
 
 PLUGIN_GLIDE = plugins/glide/glide.o \
-               plugins/glide/intf_glide.o \
                plugins/glide/vout_glide.o
 
+PLUGIN_GTK =   plugins/gtk/gtk.o \
+               plugins/gtk/intf_gtk.o \
+               plugins/gtk/gtk_callbacks.o \
+               plugins/gtk/gtk_interface.o \
+               plugins/gtk/gtk_support.o
+
 PLUGIN_GNOME = plugins/gnome/gnome.o \
                plugins/gnome/intf_gnome.o \
                plugins/gnome/gnome_callbacks.o \
                plugins/gnome/gnome_interface.o \
                plugins/gnome/gnome_support.o
 
+PLUGIN_KDE =   plugins/kde/kde.o \
+               plugins/kde/intf_kde.o \
+               plugins/kde/kvlc.o
+
 PLUGIN_IDCT =  plugins/idct/idct.o \
                plugins/idct/idct_common.o
 
@@ -334,7 +346,6 @@ PLUGIN_IDCTMMXEXT = plugins/idct/idctmmxext.o \
                        plugins/idct/idct_common.o
 
 PLUGIN_MGA =   plugins/mga/mga.o \
-               plugins/mga/intf_mga.o \
                plugins/mga/vout_mga.o
 
 PLUGIN_MOTION =        plugins/motion/motion.o \
@@ -410,10 +421,12 @@ STD_PLUGIN_OBJ := $(filter-out $(STD_PLUGIN_COMMON), \
 
 NONSTD_PLUGIN_OBJ = \
                $(PLUGIN_GLIDE) \
+               $(PLUGIN_GTK) \
                $(PLUGIN_GNOME)
 
 NONSTD_CPP_PLUGIN_OBJ = \
-               $(PLUGIN_BEOS)
+               $(PLUGIN_BEOS) \
+               $(PLUGIN_KDE)
 
 #
 # Other lists of files
@@ -489,7 +502,7 @@ snapshot:
                do cp $$i /tmp/vlc-@VLC_VERSION@/$$i ; \
        done
        # copy misc files
-       cp vlc.spec AUTHORS COPYING ChangeLog INSTALL README TODO \
+       cp vlc.spec AUTHORS COPYING ChangeLog CONTRIBUTORS INSTALL README TODO \
                Makefile.in Makefile.dep configure configure.in install-sh \
                config.sub config.guess todo.pl \
                        /tmp/vlc-@VLC_VERSION@/
@@ -536,10 +549,10 @@ plugins: $(PLUGINS:%=lib/%.so)
 FORCE:
 
 #
-# Gnome and Framebuffer aliases - don't add new aliases which could bloat
+# GTK/Gnome and Framebuffer aliases - don't add new aliases which could bloat
 # the namespace
 #
-gvlc fbvlc: vlc
+gvlc kvlc: vlc
        rm -f $@ && ln -s vlc $@
 
 
@@ -571,6 +584,11 @@ $(STD_PLUGIN_OBJ): %.o: .dep/%.d
 $(STD_PLUGIN_OBJ): %.o: %.c
        $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
 
+$(PLUGIN_GTK): %.o: Makefile.dep
+$(PLUGIN_GTK): %.o: .dep/%.d
+$(PLUGIN_GTK): %.o: %.c
+       $(CC) $(CFLAGS) $(PCFLAGS) `gtk-config --cflags gtk` -c -o $@ $<
+
 $(PLUGIN_GNOME): %.o: Makefile.dep
 $(PLUGIN_GNOME): %.o: .dep/%.d
 $(PLUGIN_GNOME): %.o: %.c
@@ -581,6 +599,11 @@ $(PLUGIN_GLIDE): %.o: .dep/%.d
 $(PLUGIN_GLIDE): %.o: %.c
        $(CC) $(CFLAGS) $(PCFLAGS) -I/usr/include/glide -c -o $@ $<
 
+$(PLUGIN_KDE): %.o: Makefile.dep
+$(PLUGIN_KDE): %.o: .dep/%.dpp
+$(PLUGIN_KDE): %.o: %.cpp
+       $(CC) $(CFLAGS) $(PCFLAGS) -I/usr/include/kde -I/usr/include/qt -fno-rtti -c -o $@ $<
+
 $(PLUGIN_BEOS): %.o: Makefile.dep
 $(PLUGIN_BEOS): %.o: .dep/%.dpp
 $(PLUGIN_BEOS): %.o: %.cpp
@@ -616,6 +639,9 @@ endif
 lib/dsp.so: $(PLUGIN_DSP)
        $(CC) $(PCFLAGS) -shared -o $@ $^
 
+lib/kde.so: $(PLUGIN_KDE)
+       $(CC) $(PCFLAGS) -shared -o $@ $^ -lkdeui -lkdecore -lqt -ldl
+
 lib/alsa.so: $(PLUGIN_ALSA)
        $(CC) $(PCFLAGS) -shared -o $@ $^ -lasound
 
@@ -628,6 +654,9 @@ lib/x11.so: $(PLUGIN_X11)
 lib/mga.so: $(PLUGIN_MGA)
        $(CC) $(PCFLAGS) -shared -o $@ $^ -L/usr/X11R6/lib -lX11 -lXext
 
+lib/gtk.so: $(PLUGIN_GTK)
+       $(CC) $(PCFLAGS) -shared -o $@ $^ `gtk-config --libs gtk | sed 's,-rdynamic,,'`
+
 lib/gnome.so: $(PLUGIN_GNOME)
        $(CC) $(PCFLAGS) -shared -o $@ $^ `gnome-config --libs gnomeui | sed 's,-rdynamic,,'`
 
@@ -641,7 +670,7 @@ lib/sdl.so: $(PLUGIN_SDL)
        $(CC) $(PCFLAGS) -shared -o $@ $^ $(LIB_SDL)
 
 lib/ncurses.so: $(PLUGIN_NCURSES)
-       $(CC) $(PCFLAGS) -shared -o $@ $^ -lcurses
+       $(CC) $(PCFLAGS) -shared -o $@ $^ -lncurses
 
 ifeq ($(SYS),beos)
 lib/null.so: $(PLUGIN_NULL)