ifeq ($(shell [ ! -r Makefile.opts ] && echo 1),)
include Makefile.opts
endif
+ifeq ($(shell [ ! -r Makefile.config ] && echo 1),)
+ include Makefile.config
+endif
###############################################################################
# Objects and files
# All possible plugin directories, needed for make clean
#
PLUGINS_DIR := a52 \
+ a52_system \
aa \
ac3_adec \
ac3_spdif \
text \
vcd \
win32 \
- x11
+ x11 \
+ xosd
PLUGINS_TARGETS := a52/a52 \
aa/aa \
+ a52_system/a52_system \
ac3_adec/ac3_adec \
ac3_spdif/ac3_spdif \
access/file \
esd/esd \
fb/fb \
ffmpeg/ffmpeg \
+ filter/filter_clone \
+ filter/filter_crop \
filter/filter_deinterlace \
- filter/filter_transform \
- filter/filter_invert \
filter/filter_distort \
+ filter/filter_invert \
+ filter/filter_transform \
filter/filter_wall \
+ filter/filter_clone \
fx/fx_scope \
ggi/ggi \
glide/glide \
motion/motionmmxext \
motion/motion3dnow \
motion/motionaltivec \
- mpeg_system/mpeg_audio \
+ mpeg_system/mpeg_audio \
mpeg_system/mpeg_es \
mpeg_system/mpeg_ps \
mpeg_system/mpeg_ts \
win32/waveout \
win32/intfwin \
x11/x11 \
- x11/xvideo
+ x11/xvideo \
+ xosd/xosd
#
# C Objects
#
-INTERFACE := main interface intf_msg intf_playlist intf_eject
+VLC := vlc
+LIBVLC := libvlc
+INTERFACE := interface intf_eject
+PLAYLIST := playlist
INPUT := input input_ext-plugins input_ext-dec input_ext-intf input_dec input_programs input_clock mpeg_system
VIDEO_OUTPUT := video_output video_text vout_pictures vout_subpictures
AUDIO_OUTPUT := audio_output aout_ext-dec aout_pcm aout_spdif
-MISC := mtime modules configuration netutils iso_lang
+MISC := mtime modules threads cpu configuration netutils iso_lang messages objects extras
-C_OBJ := $(INTERFACE:%=src/interface/%.o) \
+LIBVLC_OBJ := $(LIBVLC:%=src/%.o) \
+ $(INTERFACE:%=src/interface/%.o) \
+ $(PLAYLIST:%=src/playlist/%.o) \
$(INPUT:%=src/input/%.o) \
$(VIDEO_OUTPUT:%=src/video_output/%.o) \
$(AUDIO_OUTPUT:%=src/audio_output/%.o) \
$(MISC:%=src/misc/%.o)
+VLC_OBJ := $(VLC:%=src/%.o)
+
+C_OBJ := $(VLC_OBJ) $(LIBVLC_OBJ)
+
#
# Misc Objects
#
ifeq ($(NEED_GETOPT),1)
-C_OBJ += extras/GNUgetopt/getopt.o extras/GNUgetopt/getopt1.o
+LIBVLC_OBJ += extras/GNUgetopt/getopt.o extras/GNUgetopt/getopt1.o
endif
ifeq ($(NEED_SYMBOLS),1)
-C_OBJ += src/misc/symbols.o
+LIBVLC_OBJ += src/misc/symbols.o
endif
ifeq ($(SYS),beos)
endif
ifneq (,$(findstring darwin,$(SYS)))
-C_OBJ += src/misc/darwin_specific.o
+LIBVLC_OBJ += src/misc/darwin_specific.o
endif
ifneq (,$(findstring mingw32,$(SYS)))
-C_OBJ += src/misc/win32_specific.o
+LIBVLC_OBJ += src/misc/win32_specific.o
RESOURCE_OBJ := share/vlc_win32_rc.o
endif
-VLC_OBJ := $(C_OBJ) $(CPP_OBJ) $(M_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ)
+LIBVLC_OBJ += $(CPP_OBJ) $(M_OBJ) $(BUILTIN_OBJ)
+VLC_OBJ += $(RESOURCE_OBJ)
#
# Generated header
#
# Virtual targets
#
-all: Makefile.opts vlc ${ALIASES} vlc.app plugins po
+all: Makefile.opts vlc ${ALIASES} vlc.app plugins po mozilla/libvlcplugin.so
Makefile.opts:
@echo "**** No configuration found, please run ./configure"
#
# Cleaning rules
#
-clean: plugins-clean po-clean vlc-clean
+clean: plugins-clean po-clean vlc-clean mozilla-clean
rm -f src/*/*.o extras/*/*.o
rm -f lib/*.so* lib/*.a
rm -f plugins/*.so plugins/*.a plugins/*.lib plugins/*.tds
- rm -rf extras/MacOSX/build
+ rm -Rf extras/MacOSX/build
po-clean:
-cd po && $(MAKE) clean
rm -f vlc gnome-vlc gvlc kvlc qvlc vlc.exe
rm -Rf vlc.app
+mozilla-clean:
+ -cd mozilla && $(MAKE) clean
+
distclean: clean
-cd po && $(MAKE) maintainer-clean
rm -f **/*.o **/*~ *.log
- rm -f Makefile.opts
+ rm -f Makefile.opts Makefile.config
rm -f include/defs.h include/modules_builtin.h
rm -f src/misc/modules_builtin.h
rm -f config*status config*cache config*log conftest*
#
# Install/uninstall rules
#
-install: vlc-install plugins-install po-install
+install: vlc-install plugins-install po-install mozilla-install
-uninstall: vlc-uninstall plugins-uninstall po-uninstall
+uninstall: vlc-uninstall plugins-uninstall po-uninstall mozilla-uninstall
vlc-install:
mkdir -p $(DESTDIR)$(bindir)
ifneq (,$(ALIASES))
for alias in $(ALIASES) ; do if test $$alias ; then rm -f $(DESTDIR)$(bindir)/$$alias && ln -s vlc $(DESTDIR)$(bindir)/$$alias ; fi ; done
endif
- 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
+ mkdir -p $(DESTDIR)$(datadir)/vlc
+ $(INSTALL) -m 644 share/*.psf $(DESTDIR)$(datadir)/vlc
+ $(INSTALL) -m 644 share/*.png $(DESTDIR)$(datadir)/vlc
+ $(INSTALL) -m 644 share/*.xpm $(DESTDIR)$(datadir)/vlc
vlc-uninstall:
rm -f $(DESTDIR)$(bindir)/vlc
ifneq (,$(ALIASES))
for alias in $(ALIASES) ; do if test $$alias ; then rm -f $(DESTDIR)$(bindir)/$$alias ; fi ; done
endif
- rm -f $(DESTDIR)$(datadir)/videolan/*.psf
- rm -f $(DESTDIR)$(datadir)/videolan/*.png
- rm -f $(DESTDIR)$(datadir)/videolan/*.xpm
+ rm -f $(DESTDIR)$(datadir)/vlc/*.psf
+ rm -f $(DESTDIR)$(datadir)/vlc/*.png
+ rm -f $(DESTDIR)$(datadir)/vlc/*.xpm
plugins-install:
- mkdir -p $(DESTDIR)$(libdir)/videolan/vlc
+ mkdir -p $(DESTDIR)$(libdir)/vlc
ifneq (,$(PLUGINS))
- $(INSTALL) -m 644 $(PLUGINS:%=plugins/%.so) $(DESTDIR)$(libdir)/videolan/vlc
+ $(INSTALL) -m 644 $(PLUGINS:%=plugins/%.so) $(DESTDIR)$(libdir)/vlc
endif
plugins-uninstall:
- rm -f $(DESTDIR)$(libdir)/videolan/vlc/*.so
+ rm -f $(DESTDIR)$(libdir)/vlc/*.so
+
+mozilla-install:
+ifeq ($(MOZILLA),1)
+ -cd mozilla && $(MAKE) install
+endif
+
+mozilla-uninstall:
+ifeq ($(MOZILLA),1)
+ -cd mozilla && $(MAKE) uninstall
+endif
po-install:
-cd po && $(MAKE) install
# Copy misc files
cp FAQ AUTHORS COPYING TODO todo.pl ChangeLog* README* INSTALL* \
ABOUT-NLS BUGS MODULES vlc.spec \
- Makefile Makefile.opts.in Makefile.dep Makefile.modules \
+ Makefile Makefile.*.in Makefile.dep Makefile.modules \
configure configure.in install-sh install-win32 macosx-dmg \
config.sub config.guess aclocal.m4 mkinstalldirs \
tmp/vlc/
cp $$file tmp/vlc/share ; done
# Build archives
F=vlc-${VERSION}; \
- mv tmp/vlc tmp/$$F; (cd tmp ; tar czf ../$$F.tar.gz $$F); \
+ mv tmp/vlc tmp/$$F; (cd tmp ; \
+ cd $$F && $(MAKE) distclean && cd .. ; \
+ tar czf ../$$F.tar.gz $$F);
# Clean up
rm -Rf tmp
# Copy relevant files
cp vlc tmp/vlc/
strip tmp/vlc/vlc
+ xres -o tmp/vlc/vlc ./share/vlc_beos.rsrc
cp AUTHORS COPYING ChangeLog README FAQ TODO tmp/vlc/
for file in default8x16.psf default8x9.psf ; \
do cp share/$$file tmp/vlc/share/ ; done
# Copy relevant files
cp -R vlc.app tmp/
- cp AUTHORS COPYING ChangeLog README README\ -\ Mac\ OS\ X.rtf FAQ TODO tmp/
+ cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf FAQ TODO tmp/
# Create disk image
./macosx-dmg 0 "vlc-${VERSION}" tmp/*
#
# Generic rules (see below)
#
-$(H_OBJ): Makefile.opts Makefile.dep Makefile
-# @echo "regenerating $@"
+src/misc/modules_builtin.h: Makefile.opts Makefile
+ @echo "make[$(MAKELEVEL)]: Creating \`$@'"
@rm -f $@ && cp $@.in $@
ifneq (,$(BUILTINS))
@for i in $(BUILTINS) ; do \
#
# Main application target
#
-vlc: Makefile.opts Makefile.dep Makefile $(VLC_OBJ) $(BUILTIN_OBJ)
- $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LDFLAGS) $(vlc_LDFLAGS) $(builtins_LDFLAGS)
+vlc: Makefile.config Makefile.opts Makefile.dep Makefile $(VLC_OBJ) lib/libvlc.a $(BUILTIN_OBJ)
+ $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) lib/libvlc.a $(BUILTIN_OBJ) $(LDFLAGS) $(vlc_LDFLAGS) $(builtins_LDFLAGS)
ifeq ($(SYS),beos)
xres -o $@ ./share/vlc_beos.rsrc
mimeset -f $@
endif
+# here are the rules for a dynamic link of libvlc:
+#vlc: Makefile.opts Makefile.dep Makefile $(VLC_OBJ) lib/libvlc.so $(BUILTIN_OBJ)
+# $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LDFLAGS) $(builtins_LDFLAGS) -L./lib -lvlc
+
+#
+# Main library target
+#
+lib/libvlc.a: Makefile.opts Makefile.dep Makefile $(LIBVLC_OBJ)
+ rm -f $@
+ ar rc $@ $(LIBVLC_OBJ)
+ $(RANLIB) $@
+
+#lib/libvlc.so: Makefile.opts Makefile.dep Makefile $(LIBVLC_OBJ)
+# $(CC) -shared $(LIBVLC_OBJ) $(LDFLAGS) $(vlc_LDFLAGS) -o $@
+# chmod a-x $@
+
#
# Plugins target
#
plugins: Makefile.modules Makefile.opts Makefile.dep Makefile $(PLUGIN_OBJ)
-$(PLUGIN_OBJ): FORCE
+$(PLUGIN_OBJ): $(H_OBJ) FORCE
@cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.so=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) -f ../../Makefile.modules $(@:plugins/%=../%)
#
# Built-in modules target
#
builtins: Makefile.modules Makefile.opts Makefile.dep Makefile $(BUILTIN_OBJ)
-$(BUILTIN_OBJ): FORCE
+$(BUILTIN_OBJ): $(H_OBJ) FORCE
@cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.a=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) -f ../../Makefile.modules $(@:plugins/%=../%)
+#
+# Mozilla plugin target
+#
+mozilla/libvlcplugin.so: FORCE
+ifeq ($(MOZILLA),1)
+ @cd mozilla && $(MAKE) builtins_LDFLAGS="$(builtins_LDFLAGS)"
+endif
+
#
# gettext target
#
projects / vlc / blobdiff