summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authornick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-01-07 09:28:22 +0000
committernick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-01-07 09:28:22 +0000
commit75c0b3169b79bfa85c905f87f0c77c07f04f29ad (patch)
treec2b7106529d50e759883d278bda6744af7318381 /Makefile
parentcb6aa3b4a8629a9678b212c51d057171e6a19bd8 (diff)
downloadmpv-75c0b3169b79bfa85c905f87f0c77c07f04f29ad.tar.bz2
mpv-75c0b3169b79bfa85c905f87f0c77c07f04f29ad.tar.xz
Embedding vidix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4031 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile21
1 files changed, 17 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index bc18fb7f53..29ee450f71 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,9 @@ PRG_FIBMAP = fibmap_mplayer
PRG_TV = tvision
PRG_CFG = codec-cfg
PRG_MENCODER = mencoder
+# these subdirectories required installation due binaries within them
+SUBDIRS = libdha vidix
+DO_MAKE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
#prefix = /usr/local
BINDIR = ${prefix}/bin
@@ -42,11 +45,12 @@ AO_LIBS = -Llibao2 -lao2
A_LIBS = $(ALSA_LIB) $(NAS_LIB) $(MAD_LIB) $(VORBIS_LIB) $(SGIAUDIO_LIB)
CODEC_LIBS = -Lg72x -lg72x -Lmp3lib -lMP3 -Llibac3 -lac3 -Lliba52 -la52 -Lxa -lxa -Llibmpeg2 -lmpeg2 $(AV_LIB)
-COMMON_LIBS = -Llinux -losdep -Lpostproc -lpostproc
+COMMON_LIBS = -Llinux -losdep -Lpostproc -lpostproc -Lvidix -lvidix
+MISC_LIBS = -Llibdha -ldha
CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader $(VO_INC) $(EXTRA_INC) # -Wall
-PARTS = g72x libmpdemux mp3lib libac3 liba52 libmp1e libmpeg2 opendivx libavcodec libao2 drivers drivers/syncfb linux postproc xa
+PARTS = g72x libmpdemux mp3lib libac3 liba52 libmp1e libmpeg2 opendivx libavcodec libao2 drivers drivers/syncfb linux postproc xa libdha vidix
ifeq ($(VO2),yes)
PARTS += libvo2
else
@@ -85,7 +89,7 @@ all: $(ALL_PRG)
.c.o:
$(CC) -c $(CFLAGS) -o $@ $<
-COMMON_DEPS = g72x/libg72x.a libmpdemux/libmpdemux.a libao2/libao2.a libac3/libac3.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a opendivx/libdecore.a linux/libosdep.a postproc/libpostproc.a xa/libxa.a
+COMMON_DEPS = g72x/libg72x.a libmpdemux/libmpdemux.a libao2/libao2.a libac3/libac3.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a opendivx/libdecore.a linux/libosdep.a postproc/libpostproc.a libdha/libdha.so vidix/libvidix.a xa/libxa.a
ifeq ($(VO2),yes)
COMMON_DEPS += libvo2/libvo2.a
@@ -135,6 +139,12 @@ mp3lib/libMP3.a:
opendivx/libdecore.a:
$(MAKE) -C opendivx
+libdha/libdha.so:
+ $(MAKE) -C libdha
+
+vidix/libvidix.a:
+ $(MAKE) -C vidix
+
# encore/libencore.a:
# $(MAKE) -C encore
@@ -162,8 +172,10 @@ MENCODER_DEP += Gui/libgui.a
GUI_LIBS = -LGui -lgui
endif
+VIDIX_LIBS = -Lvidix -lvidix
+
$(PRG): $(MPLAYER_DEP)
- $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) $(CODEC_LIBS) -Llibmpdemux -lmpdemux $(VO_LIBS) $(AO_LIBS) $(LIB_LOADER) $(GUI_LIBS) $(COMMON_LIBS) $(EXTRA_LIB) $(A_LIBS) $(V_LIBS) $(LIRC_LIB) $(CSS_LIB) $(ARCH_LIB) $(DECORE_LIB) $(TERMCAP_LIB) $(STATIC_LIB) $(GTK_LIBS) $(PNG_LIB) $(Z_LIB) $(STREAMING_LIB) -lm
+ $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) $(CODEC_LIBS) -Llibmpdemux -lmpdemux $(VO_LIBS) $(AO_LIBS) $(LIB_LOADER) $(GUI_LIBS) $(COMMON_LIBS) $(EXTRA_LIB) $(A_LIBS) $(V_LIBS) $(LIRC_LIB) $(CSS_LIB) $(ARCH_LIB) $(DECORE_LIB) $(TERMCAP_LIB) $(STATIC_LIB) $(GTK_LIBS) $(PNG_LIB) $(Z_LIB) $(STREAMING_LIB) $(VIDIX_LIBS) -lm
$(PRG_FIBMAP): fibmap_mplayer.o
$(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o
@@ -185,6 +197,7 @@ $(PRG_CFG): version.h codec-cfg.c codec-cfg.h
$(CC) $(CFLAGS) -g codec-cfg.c -o $(PRG_CFG) -DCODECS2HTML
install: $(ALL_PRG)
+ $(DO_MAKE)
if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi
$(INSTALL) -m 755 -s $(PRG) $(BINDIR)/$(PRG)
ifeq ($(GUI),yes)