comparison Makefile @ 13579:fc357e2c7328

fixing --disable for mp3lib, liba52 and libmpeg2, patch by (basic (at) mozdev (dot) org), see also bug #102
author reimar
date Thu, 07 Oct 2004 09:31:16 +0000
parents 8e026ebb082f
children c0bde085511c
comparison
equal deleted inserted replaced
13578:b33ee5b68414 13579:fc357e2c7328
31 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o) 31 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
32 32
33 VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) $(CACA_LIB) 33 VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) $(CACA_LIB)
34 AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(JACK_LIB) $(NAS_LIB) $(SGIAUDIO_LIB) 34 AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(JACK_LIB) $(NAS_LIB) $(SGIAUDIO_LIB)
35 CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(THEORA_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(DTS_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(X264_LIB) 35 CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(THEORA_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(DTS_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(X264_LIB)
36 COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(DVDREAD_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB) $(FONTCONFIG_LIB) $(ENCA_LIB) 36 COMMON_LIBS = libmpcodecs/libmpcodecs.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(DVDREAD_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB) $(FONTCONFIG_LIB) $(ENCA_LIB)
37 37
38 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) $(DVB_INC) $(XVID_INC) $(FONTCONFIG_INC) $(CACA_INC) # -Wall 38 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) $(DVB_INC) $(XVID_INC) $(FONTCONFIG_INC) $(CACA_INC) # -Wall
39 ifeq ($(TOOLAME),yes) 39 ifeq ($(TOOLAME),yes)
40 CFLAGS += $(TOOLAME_EXTRAFLAGS) 40 CFLAGS += $(TOOLAME_EXTRAFLAGS)
41 CODEC_LIBS += $(TOOLAME_LIB) 41 CODEC_LIBS += $(TOOLAME_LIB)
42 endif 42 endif
43 43
44 PARTS = libmpdemux libmpcodecs mp3lib liba52 libmpeg2 libavcodec libavformat libao2 drivers osdep postproc input libvo libaf 44 PARTS = libmpdemux libmpcodecs libavcodec libavformat libao2 drivers osdep postproc input libvo libaf
45 ifeq ($(MP3LIB),yes)
46 PARTS += mp3lib
47 endif
48 ifeq ($(LIBA52),yes)
49 PARTS += liba52
50 endif
51 ifeq ($(LIBMPEG2),yes)
52 PARTS += libmpeg2
53 endif
45 ifeq ($(INTERNAL_FAAD),yes) 54 ifeq ($(INTERNAL_FAAD),yes)
46 COMMON_LIBS += libfaad2/libfaad2.a 55 COMMON_LIBS += libfaad2/libfaad2.a
47 PARTS += libfaad2 56 PARTS += libfaad2
48 endif 57 endif
49 ifeq ($(VIDIX),yes) 58 ifeq ($(VIDIX),yes)
72 ALL_PRG = $(PRG) 81 ALL_PRG = $(PRG)
73 ifeq ($(MENCODER),yes) 82 ifeq ($(MENCODER),yes)
74 ALL_PRG += $(PRG_MENCODER) 83 ALL_PRG += $(PRG_MENCODER)
75 endif 84 endif
76 85
77 COMMON_DEPS = $(W32_DEP) $(DS_DEP) $(MP1E_DEP) $(AV_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a osdep/libosdep.a postproc/libswscale.a input/libinput.a libvo/libvo.a libaf/libaf.a 86 COMMON_DEPS = $(W32_DEP) $(DS_DEP) $(MP1E_DEP) $(AV_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a osdep/libosdep.a postproc/libswscale.a input/libinput.a libvo/libvo.a libaf/libaf.a
78 87
88 ifeq ($(MP3LIB),yes)
89 COMMON_DEPS += mp3lib/libMP3.a
90 COMMON_LIBS += mp3lib/libMP3.a
91 endif
92 ifeq ($(LIBA52),yes)
93 COMMON_DEPS += liba52/liba52.a
94 COMMON_LIBS += liba52/liba52.a
95 endif
96 ifeq ($(LIBMPEG2),yes)
97 COMMON_DEPS += libmpeg2/libmpeg2.a
98 COMMON_LIBS += libmpeg2/libmpeg2.a
99 endif
79 ifeq ($(INTERNAL_FAAD),yes) 100 ifeq ($(INTERNAL_FAAD),yes)
80 COMMON_DEPS += libfaad2/libfaad2.a 101 COMMON_DEPS += libfaad2/libfaad2.a
81 endif 102 endif
82 ifeq ($(VIDIX),yes) 103 ifeq ($(VIDIX),yes)
83 COMMON_DEPS += libdha/libdha.so vidix/libvidix.a 104 COMMON_DEPS += libdha/libdha.so vidix/libvidix.a