src/interface/intf_msg.o \
src/interface/intf_cmd.o \
src/interface/intf_ctrl.o \
- src/interface/intf_plst.o \
+ src/interface/intf_playlist.o \
src/interface/intf_channels.o \
- src/interface/intf_console.o
+ src/interface/intf_console.o \
+ src/interface/intf_urldecode.o \
INPUT = src/input/input_ext-dec.o \
src/input/input_ext-intf.o \
PLUGIN_BEOS = plugins/beos/beos.o \
plugins/beos/aout_beos.o \
plugins/beos/intf_beos.o \
- plugins/beos/vout_beos.o
+ plugins/beos/vout_beos.o \
+ plugins/beos/DrawingTidbits.o \
+ plugins/beos/TransportButton.o
PLUGIN_DSP = plugins/dsp/dsp.o \
plugins/dsp/aout_dsp.o
plugins/gtk/intf_gtk.o \
plugins/gtk/gtk_callbacks.o \
plugins/gtk/gtk_interface.o \
- plugins/gtk/gtk_support.o
+ plugins/gtk/gtk_support.o \
+ plugins/gtk/gtk_playlist.o
PLUGIN_GNOME = plugins/gnome/gnome.o \
plugins/gnome/intf_gnome.o \
plugins/gnome/gnome_interface.o \
plugins/gnome/gnome_support.o
+PLUGIN_QT = plugins/qt/qt.o \
+ plugins/qt/intf_qt.o
+
PLUGIN_KDE = plugins/kde/kde.o \
- plugins/kde/intf_kde.o \
- plugins/kde/kvlc.o
+ plugins/kde/intf_kde.o
PLUGIN_IDCT = plugins/idct/idct.o \
plugins/idct/idct_common.o
NONSTD_CPP_PLUGIN_OBJ = \
$(PLUGIN_BEOS) \
+ $(PLUGIN_QT) \
$(PLUGIN_KDE)
#
clean:
rm -f $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ) $(STD_PLUGIN_OBJ)
rm -f plugins/*/*.o src/*/*.o lib/*.so
- rm -f vlc kvlc gvlc
+ rm -f vlc gvlc kvlc qvlc
distclean: clean
rm -f src/*/*.o plugins/*/*.o **/*~ *.log
mkdir -p $(DESTDIR)$(datadir)/videolan
$(INSTALL) -m 644 share/*.psf $(DESTDIR)$(datadir)/videolan
$(INSTALL) -m 644 share/*.png $(DESTDIR)$(datadir)/videolan
+ $(INSTALL) -m 644 share/*.xpm $(DESTDIR)$(datadir)/videolan
show:
@echo CC: $(CC)
snapshot:
rm -rf /tmp/vlc-@VLC_VERSION@* /tmp/vlc-@VLC_VERSION@nocss*
# copy archive in /tmp
- find -type d | while read i ; \
+ find -type d | grep -v CVS | grep -v '\.dep' | while read i ; \
do mkdir -p /tmp/vlc-@VLC_VERSION@/$$i ; \
done
- find debian -mindepth 1 -maxdepth 1 -type d | grep -v CVS | \
+ find debian -mindepth 1 -maxdepth 1 -type d | \
while read i ; do rm -rf /tmp/vlc-@VLC_VERSION@/$$i ; done
- # CVS entries
- find . -type f | grep CVS | while read i ; \
- do cp $$i /tmp/vlc-@VLC_VERSION@/$$i ; \
- done
# .c .h .in .cpp
find include src plugins -type f -name '*.[chi]*' | while read i ; \
do cp $$i /tmp/vlc-@VLC_VERSION@/$$i ; \
done
# copy misc files
- cp vlc.spec AUTHORS COPYING ChangeLog CONTRIBUTORS INSTALL README TODO \
+ cp vlc.spec AUTHORS COPYING ChangeLog INSTALL README TODO \
Makefile.in Makefile.dep configure configure.in install-sh \
config.sub config.guess todo.pl \
/tmp/vlc-@VLC_VERSION@/
- for file in control vlc-gtk.menu vlc.copyright vlc.docs changelog \
- rules vlc.1 vlc.dirs vlc.menu ; do \
+ for file in control control-css vlc-gtk.menu vlc.copyright vlc.docs \
+ changelog changelog-css rules rules-css vlc.1 vlc.dirs \
+ vlc.menu ; do \
cp debian/$$file /tmp/vlc-@VLC_VERSION@/debian/ ; done
- for file in default8x16.psf default8x9.psf gvlc.png vlc.png ; do \
- cp share/$$file /tmp/vlc-@VLC_VERSION@/share/ ; done
+ for file in default8x16.psf default8x9.psf gvlc.png vlc.png \
+ gvlc.xpm vlc.xpm ; do \
+ cp share/$$file /tmp/vlc-@VLC_VERSION@/share/ ; done
# build css-enabled archives
(cd /tmp ; tar cf vlc-@VLC_VERSION@.tar vlc-@VLC_VERSION@ ; \
gzip -f -9 vlc-@VLC_VERSION@.tar )
mv /tmp/vlc-@VLC_VERSION@.tar.gz /tmp/vlc-@VLC_VERSION@.tar.bz2 ..
- # removing CSS stuff
- for x in plugins/dvd/dvd.c plugins/dvd/dvd_css.c ; do \
- rm -f /tmp/vlc-@VLC_VERSION@/$$x ; \
- perl -ne 'if (/^#e(lse|ndif).*HAVE_CSS/) { $$i=0; } \
- if (/^#if.*HAVE_CSS/) { $$i=1; } \
- elsif (!$$i && !/^#.*HAVE_CSS/) { print $$_; }' \
- < $$x >| /tmp/vlc-@VLC_VERSION@/$$x ; \
- done
- rm -f /tmp/vlc-@VLC_VERSION@/plugins/dvd/dvd_csstables.c
- rm -f /tmp/vlc-@VLC_VERSION@/debian/changelog
- sed 's/\(^vlc ([^-]*\)-/\1nocss-/' < debian/changelog \
- > /tmp/vlc-@VLC_VERSION@/debian/changelog
-
- # build nocss archives
- (cd /tmp ; mv vlc-@VLC_VERSION@ vlc-@VLC_VERSION@nocss ; \
- tar cf vlc-@VLC_VERSION@nocss.tar vlc-@VLC_VERSION@nocss ; \
- bzip2 -f -9 < vlc-@VLC_VERSION@nocss.tar \
- > vlc-@VLC_VERSION@nocss.tar.bz2 ; \
- gzip -f -9 vlc-@VLC_VERSION@nocss.tar )
- mv /tmp/vlc-@VLC_VERSION@nocss.tar.gz \
- /tmp/vlc-@VLC_VERSION@nocss.tar.bz2 ..
-
# clean up
rm -rf /tmp/vlc-@VLC_VERSION@*
# GTK/Gnome and Framebuffer aliases - don't add new aliases which could bloat
# the namespace
#
-gvlc kvlc: vlc
+gvlc kvlc qvlc: vlc
rm -f $@ && ln -s vlc $@
$(PLUGIN_GNOME): %.o: Makefile.dep
$(PLUGIN_GNOME): %.o: .dep/%.d
$(PLUGIN_GNOME): %.o: %.c
- $(CC) $(CFLAGS) $(PCFLAGS) `gnome-config --cflags gnomeui` -c -o $@ $<
+ $(CC) $(CFLAGS) $(PCFLAGS) `gnome-config --cflags gtk gnomeui` -c -o $@ $<
$(PLUGIN_GLIDE): %.o: Makefile.dep
$(PLUGIN_GLIDE): %.o: .dep/%.d
$(PLUGIN_GLIDE): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -I/usr/include/glide -c -o $@ $<
+$(PLUGIN_QT): %.o: Makefile.dep
+$(PLUGIN_QT): %.o: .dep/%.dpp
+$(PLUGIN_QT): %.o: %.moc
+ $(CC) $(CFLAGS) $(PCFLAGS) -I/usr/include/qt -c -o $@ $(<:%.moc=%.cpp)
+$(PLUGIN_QT:%.o=%.moc): %.moc: %.cpp
+ moc -i $< -o $@
+
$(PLUGIN_KDE): %.o: Makefile.dep
$(PLUGIN_KDE): %.o: .dep/%.dpp
$(PLUGIN_KDE): %.o: %.cpp
#
lib/beos.so: $(PLUGIN_BEOS)
- $(CC) $(PCFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_ -lbe -lgame -lroot
+ $(CC) $(PCFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_ -lbe -lgame -lroot -ltracker
lib/esd.so: $(PLUGIN_ESD)
ifneq (,$(findstring bsd,$(SYS)))
lib/dsp.so: $(PLUGIN_DSP)
$(CC) $(PCFLAGS) -shared -o $@ $^
+lib/qt.so: $(PLUGIN_QT)
+ $(CC) $(PCFLAGS) -shared -o $@ $^ -lqt
+
lib/kde.so: $(PLUGIN_KDE)
$(CC) $(PCFLAGS) -shared -o $@ $^ -lkdeui -lkdecore -lqt -ldl
projects / vlc / blobdiff