mirror of
https://github.com/mpv-player/mpv
synced 2024-11-18 21:16:10 +01:00
Merge osdep/Makefile into the top-level Makefile, thus getting rid
of recursive make in the osdep/ subdirectory. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26352 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego
parent
2abdcd86d9
commit
ff191b8495
28
Makefile
28
Makefile
@ -33,7 +33,18 @@ SRCS_COMMON = asxparser.c \
|
|||||||
subopt-helper.c \
|
subopt-helper.c \
|
||||||
subreader.c \
|
subreader.c \
|
||||||
vobsub.c \
|
vobsub.c \
|
||||||
|
osdep/$(GETCH) \
|
||||||
|
osdep/$(TIMER) \
|
||||||
|
|
||||||
|
SRCS_COMMON-$(HAVE_SYS_MMAN_H) += osdep/mmap_anon.c
|
||||||
|
SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += osdep/macosx_finder_args.c
|
||||||
|
SRCS_COMMON-$(NEED_GETTIMEOFDAY) += osdep/gettimeofday.c
|
||||||
|
SRCS_COMMON-$(NEED_GLOB) += osdep/glob-win.c
|
||||||
|
SRCS_COMMON-$(NEED_SETENV) += osdep/setenv.c
|
||||||
|
SRCS_COMMON-$(NEED_SHMEM) += osdep/shmem.c
|
||||||
|
SRCS_COMMON-$(NEED_STRSEP) += osdep/strsep.c
|
||||||
|
SRCS_COMMON-$(NEED_SWAB) += osdep/swab.c
|
||||||
|
SRCS_COMMON-$(NEED_VSSCANF) += osdep/vsscanf.c
|
||||||
SRCS_COMMON-$(UNRAR_EXEC) += unrar_exec.c
|
SRCS_COMMON-$(UNRAR_EXEC) += unrar_exec.c
|
||||||
|
|
||||||
SRCS_MPLAYER = mplayer.c \
|
SRCS_MPLAYER = mplayer.c \
|
||||||
@ -96,9 +107,6 @@ LIBS_MPLAYER-$(GUI) += gui/libgui.a
|
|||||||
LIBS_MENCODER = libmpcodecs/libmpencoders.a \
|
LIBS_MENCODER = libmpcodecs/libmpencoders.a \
|
||||||
libmpdemux/libmpmux.a \
|
libmpdemux/libmpmux.a \
|
||||||
|
|
||||||
# Having this in libosdep.a is not enough.
|
|
||||||
OBJS_MPLAYER-$(TARGET_WIN32) += osdep/mplayer-rc.o
|
|
||||||
|
|
||||||
ALL_PRG-$(MPLAYER) += mplayer$(EXESUF)
|
ALL_PRG-$(MPLAYER) += mplayer$(EXESUF)
|
||||||
ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
|
ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
|
||||||
|
|
||||||
@ -107,8 +115,6 @@ LIBS_MPLAYER += $(LIBS_MPLAYER-yes)
|
|||||||
OBJS_MPLAYER += $(OBJS_MPLAYER-yes)
|
OBJS_MPLAYER += $(OBJS_MPLAYER-yes)
|
||||||
ALL_PRG += $(ALL_PRG-yes)
|
ALL_PRG += $(ALL_PRG-yes)
|
||||||
|
|
||||||
COMMON_LIBS += osdep/libosdep.a
|
|
||||||
|
|
||||||
MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(LIBS_MPLAYER) $(COMMON_LIBS)
|
MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(LIBS_MPLAYER) $(COMMON_LIBS)
|
||||||
MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(LIBS_MENCODER) $(COMMON_LIBS)
|
MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(LIBS_MENCODER) $(COMMON_LIBS)
|
||||||
|
|
||||||
@ -136,13 +142,13 @@ PARTS = dvdread \
|
|||||||
libvo \
|
libvo \
|
||||||
loader \
|
loader \
|
||||||
mp3lib \
|
mp3lib \
|
||||||
osdep \
|
|
||||||
stream \
|
stream \
|
||||||
tremor \
|
tremor \
|
||||||
vidix \
|
vidix \
|
||||||
|
|
||||||
DIRS = input \
|
DIRS = input \
|
||||||
libmenu \
|
libmenu \
|
||||||
|
osdep \
|
||||||
|
|
||||||
all: $(ALL_PRG)
|
all: $(ALL_PRG)
|
||||||
|
|
||||||
@ -225,12 +231,6 @@ vidix/libvidix.a:
|
|||||||
gui/libgui.a:
|
gui/libgui.a:
|
||||||
$(MAKE) -C gui
|
$(MAKE) -C gui
|
||||||
|
|
||||||
osdep/libosdep.a:
|
|
||||||
$(MAKE) -C osdep
|
|
||||||
|
|
||||||
osdep/mplayer-rc.o: version.h
|
|
||||||
$(MAKE) -C osdep mplayer-rc.o
|
|
||||||
|
|
||||||
mplayer$(EXESUF): $(MPLAYER_DEPS)
|
mplayer$(EXESUF): $(MPLAYER_DEPS)
|
||||||
$(CC) -o $@ $^ $(LDFLAGS_MPLAYER)
|
$(CC) -o $@ $^ $(LDFLAGS_MPLAYER)
|
||||||
|
|
||||||
@ -251,6 +251,9 @@ codecs2html$(EXESUF): mp_msg.o
|
|||||||
codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h mp_msg.o osdep/getch2.o
|
codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h mp_msg.o osdep/getch2.o
|
||||||
$(CC) -I. -DTESTING codec-cfg.c mp_msg.o osdep/getch2.o -ltermcap -o $@
|
$(CC) -I. -DTESTING codec-cfg.c mp_msg.o osdep/getch2.o -ltermcap -o $@
|
||||||
|
|
||||||
|
osdep/mplayer-rc.o: osdep/mplayer.rc version.h
|
||||||
|
$(WINDRES) -o $@ $<
|
||||||
|
|
||||||
install: install-dirs $(INSTALL_TARGETS)
|
install: install-dirs $(INSTALL_TARGETS)
|
||||||
|
|
||||||
install-dirs:
|
install-dirs:
|
||||||
@ -389,7 +392,6 @@ $(MPLAYER_DEPS) $(MENCODER_DEPS): help_mp.h
|
|||||||
libvo/libvo.a: .norecurse $(wildcard libvo/*.[ch])
|
libvo/libvo.a: .norecurse $(wildcard libvo/*.[ch])
|
||||||
libvo/libosd.a: .norecurse $(wildcard libvo/*.[ch])
|
libvo/libosd.a: .norecurse $(wildcard libvo/*.[ch])
|
||||||
libao2/libao2.a: .norecurse $(wildcard libao2/*.[ch])
|
libao2/libao2.a: .norecurse $(wildcard libao2/*.[ch])
|
||||||
osdep/libosdep.a: .norecurse $(wildcard osdep/*.[ch])
|
|
||||||
|
|
||||||
libaf/libaf.a: .norecurse $(wildcard libaf/*.[ch])
|
libaf/libaf.a: .norecurse $(wildcard libaf/*.[ch])
|
||||||
dvdread/libdvdread.a: .norecurse $(wildcard dvdread/*.[ch])
|
dvdread/libdvdread.a: .norecurse $(wildcard dvdread/*.[ch])
|
||||||
|
|||||||
@ -1,23 +0,0 @@
|
|||||||
include ../config.mak
|
|
||||||
|
|
||||||
LIBNAME_COMMON = libosdep.a
|
|
||||||
|
|
||||||
SRCS_COMMON += $(GETCH)
|
|
||||||
SRCS_COMMON += $(TIMER)
|
|
||||||
|
|
||||||
SRCS_COMMON-$(HAVE_SYS_MMAN_H) += mmap_anon.c
|
|
||||||
SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += macosx_finder_args.c
|
|
||||||
|
|
||||||
SRCS_COMMON-$(NEED_GETTIMEOFDAY) += gettimeofday.c
|
|
||||||
SRCS_COMMON-$(NEED_GLOB) += glob-win.c
|
|
||||||
SRCS_COMMON-$(NEED_MMAP) += mmap-os2.c
|
|
||||||
SRCS_COMMON-$(NEED_SETENV) += setenv.c
|
|
||||||
SRCS_COMMON-$(NEED_SHMEM) += shmem.c
|
|
||||||
SRCS_COMMON-$(NEED_STRSEP) += strsep.c
|
|
||||||
SRCS_COMMON-$(NEED_SWAB) += swab.c
|
|
||||||
SRCS_COMMON-$(NEED_VSSCANF) += vsscanf.c
|
|
||||||
|
|
||||||
include ../mpcommon.mak
|
|
||||||
|
|
||||||
mplayer-rc.o: mplayer.rc
|
|
||||||
$(WINDRES) -o $@ $<
|
|
||||||
Loading…
Reference in New Issue
Block a user