alsa/alsa \
arts/arts \
beos/beos \
- chroma/chroma_yv12_rgb8 \
+ chroma/chroma_i420_rgb \
+ chroma/chroma_i420_rgb_mmx \
+ chroma/chroma_i420_yuy2 \
+ chroma/chroma_i420_yuy2_mmx \
+ chroma/chroma_i422_yuy2 \
+ chroma/chroma_i422_yuy2_mmx \
directx/directx \
dsp/dsp \
dummy/dummy \
dvdread/dvdread \
esd/esd \
fb/fb \
- filter/filter_bob \
+ filter/filter_deinterlace \
filter/filter_transform \
filter/filter_invert \
filter/filter_distort \
text/rc \
vcd/vcd \
x11/x11 \
- x11/xvideo \
- yuv/yuv \
- yuv/yuvmmx
+ x11/xvideo
#
# C Objects
INPUT := input 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_u8 aout_s8 aout_u16 aout_s16 aout_spdif
-MISC := mtime tests modules netutils iso_lang
+MISC := mtime modules netutils iso_lang
C_OBJ := $(INTERFACE:%=src/interface/%.o) \
$(INPUT:%=src/input/%.o) \
#
H_OBJ := src/misc/modules_builtin.h
+#
+# Included headers which don't get noticed by Makefile.dep
+#
+H_DEP := videolan/vlc.h \
+ defs.h \
+ config.h \
+ int_types.h \
+ modules_inner.h \
+ common.h \
+ beos_specific.h \
+ darwin_specific.h \
+ win32_specific.h \
+ intf_msg.h \
+ threads.h \
+ mtime.h \
+ modules.h \
+ main.h
+
#
# Other lists of files
#
all: Makefile.opts vlc ${ALIASES} vlc.app plugins po
Makefile.opts:
- @echo "**** No configuration found, running ./configure..."
- ./configure
- $(MAKE) $(MAKECMDGOALS)
- exit
+ @echo "**** No configuration found, please run ./configure"
+ @exit 1
+# ./configure
+# $(MAKE) $(MAKECMDGOALS)
+# exit
show:
@echo CC: $(CC)
@echo CFLAGS: $(CFLAGS)
@echo DCFLAGS: $(DCFLAGS)
- @echo LCFLAGS: $(LCFLAGS)
+ @echo LDFLAGS: $(LDFLAGS)
@echo PCFLAGS: $(PCFLAGS)
- @echo PLCFLAGS: $(PLCFLAGS)
+ @echo PLDFLAGS: $(PLDFLAGS)
@echo C_OBJ: $(C_OBJ)
@echo CPP_OBJ: $(CPP_OBJ)
@echo PLUGIN_OBJ: $(PLUGIN_OBJ)
plugins-clean:
for dir in $(PLUGINS_DIR) ; do \
- ( cd plugins/$${dir} && $(MAKE) clean ) ; done
- rm -f plugins/*/*.o plugins/*/*.moc plugins/*/*.bak
+ ( cd plugins/$${dir} \
+ && $(MAKE) -f ../../Makefile.modules clean ) ; done
+ rm -f plugins/*/*.o plugins/*/*.lo plugins/*/*.moc plugins/*/*.bak
vlc-clean:
rm -f $(C_OBJ) $(CPP_OBJ)
-cd po && $(MAKE) maintainer-clean
rm -f **/*.o **/*~ *.log
rm -f Makefile.opts
- rm -f include/defs.h include/config.h include/modules_builtin.h
+ rm -f include/defs.h include/modules_builtin.h
rm -f src/misc/modules_builtin.h
rm -f config*status config*cache config*log
rm -f gmon.out core build-stamp
mv tmp/vlc tmp/vlc-${VLC_QUICKVERSION}
(cd tmp ; find vlc-${VLC_QUICKVERSION} | \
zip -9 -@ vlc-${VLC_QUICKVERSION}-beos.zip )
- mv tmp/vlc-${VLC_QUICKVERSION}-beos.zip .
+ mv tmp/vlc-${VLC_QUICKVERSION}-BeOS-x86.zip .
# Clean up
rm -Rf tmp
rm -Rf tmp/vlc/ipkg
# Remove useless headers
rm -f tmp/vlc/include/*
- for file in defs.h.in config.h.in common.h int_types.h ; \
+ for file in defs.h.in config.h common.h int_types.h ; \
do cp include/$$file tmp/vlc/include/ ; done
# Remove misc files (??? - maybe not really needed)
rm -f tmp/vlc/vlc.spec tmp/vlc/INSTALL-win32.txt
#
# Generic rules (see below)
#
-$(C_DEP): %.d: FORCE
- @$(MAKE) -s --no-print-directory -f Makefile.dep $@
-
-$(CPP_DEP): %.dpp: FORCE
- @$(MAKE) -s --no-print-directory -f Makefile.dep $@
-
$(H_OBJ): Makefile.opts Makefile.dep Makefile
- rm -f $@ && cp $@.in $@
+# @echo "regenerating $@"
+ @rm -f $@ && cp $@.in $@
ifneq (,$(BUILTINS))
- for i in $(BUILTINS) ; do \
- echo "int module_"$$i"_InitModule( module_t* );" >> $@ ; \
- echo "int module_"$$i"_ActivateModule( module_t* );" >> $@ ; \
- echo "int module_"$$i"_DeactivateModule( module_t* );" >> $@ ; \
+ @for i in $(BUILTINS) ; do \
+ echo "int InitModule__MODULE_"$$i"( module_t* );" >>$@; \
+ echo "int ActivateModule__MODULE_"$$i"( module_t* );" >>$@; \
+ echo "int DeactivateModule__MODULE_"$$i"( module_t* );" >>$@; \
done
- echo "" >> $@ ;
- printf "#define ALLOCATE_ALL_BUILTINS() do { " >> $@ ;
- for i in $(BUILTINS) ; do \
- printf "ALLOCATE_BUILTIN("$$i"); " >> $@ ; \
+ @echo "" >> $@ ;
+endif
+ @echo "#define ALLOCATE_ALL_BUILTINS() \\" >> $@ ;
+ @echo " do \\" >> $@ ;
+ @echo " { \\" >> $@ ;
+ifneq (,$(BUILTINS))
+ @for i in $(BUILTINS) ; do \
+ echo " ALLOCATE_BUILTIN("$$i"); \\" >> $@ ; \
done
- echo "} while( 0 );" >> $@ ;
- echo "" >> $@ ;
+ @echo " } while( 0 );" >> $@ ;
+ @echo "" >> $@ ;
endif
+$(C_DEP): %.d: FORCE
+ @$(MAKE) -s --no-print-directory -f Makefile.dep $@
+
+$(CPP_DEP): %.dpp: FORCE
+ @$(MAKE) -s --no-print-directory -f Makefile.dep $@
+
$(C_OBJ): %.o: Makefile.opts Makefile.dep Makefile
+$(C_OBJ): %.o: $(H_OBJ) $(H_DEP:%=include/%)
$(C_OBJ): %.o: .dep/%.d
$(C_OBJ): %.o: %.c
$(CC) $(CFLAGS) $(CFLAGS_VLC) -c -o $@ $<
$(CPP_OBJ): %.o: Makefile.opts Makefile.dep Makefile
+$(CPP_OBJ): %.o: $(H_OBJ) $(H_DEP:%=include/%)
$(CPP_OBJ): %.o: .dep/%.dpp
$(CPP_OBJ): %.o: %.cpp
$(CC) $(CFLAGS) $(CFLAGS_VLC) -c -o $@ $<
#
# Main application target
#
-vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(VLC_OBJ) $(BUILTIN_OBJ)
- $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LCFLAGS)
+vlc: Makefile.opts Makefile.dep Makefile $(VLC_OBJ) $(BUILTIN_OBJ)
+ $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LDFLAGS)
ifeq ($(SYS),beos)
xres -o $@ ./share/vlc_beos.rsrc
mimeset -f $@
#
plugins: Makefile.modules Makefile.opts Makefile.dep Makefile $(PLUGIN_OBJ)
$(PLUGIN_OBJ): FORCE
- @cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.so=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:plugins/%=../%)
+ @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
- @cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.a=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:plugins/%=../%)
+ @cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:plugins/%.a=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) -f ../../Makefile.modules $(@:plugins/%=../%)
#
# libdvdcss target
projects / vlc / blobdiff