github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-28 06:03:45 +01:00
Code Releases Activity

Split libs that are dependencies and those that are just linker flags.

Browse Source 
Fixes spurious rebuilds of MPlayer and MEncoder.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21146 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-11-21 17:42:20 +00:00
parent 738e5816b9
commit 37fd66bd41
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -67,12 +67,8 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \
LIBS_MPLAYER = libvo/libvo.a \
libao2/libao2.a \
input/libinput.a \
$(EXTRALIBS_MPLAYER) \
$(COMMON_LIBS) \
LIBS_MENCODER = libmpcodecs/libmpencoders.a \
$(EXTRALIBS_MENCODER) \
$(COMMON_LIBS) \
OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
@ -162,8 +158,14 @@ ifeq ($(TARGET_WIN32),yes)
OBJS_MPLAYER += osdep/mplayer-rc.o
endif
COMMON_LIBS += $(EXTRA_LIB)\
$(EXTRALIBS) \
COMMON_LDFLAGS += $(EXTRA_LIB)\
$(EXTRALIBS) \
LDFLAGS_MPLAYER = $(EXTRALIBS_MPLAYER) \
$(COMMON_LDFLAGS) \
LDFLAGS_MENCODER = $(EXTRALIBS_MENCODER) \
$(COMMON_LIBS) \
ifeq ($(MPLAYER),yes)
ALL_PRG = mplayer$(EXESUF)
@ -264,10 +266,10 @@ libmenu/libmenu.a:
$(MAKE) -C libmenu
mplayer$(EXESUF): $(MPLAYER_DEPS)
$(CC) -o $@ $(OBJS_MPLAYER) $(LIBS_MPLAYER)
$(CC) -o $@ $^ $(LDFLAGS_MPLAYER)
mencoder$(EXESUF): $(MENCODER_DEPS)
$(CC) -o $@ $(OBJS_MENCODER) $(LIBS_MENCODER)
$(CC) -o $@ $^ $(LDFLAGS_MENCODER)
osdep/mplayer-rc.o: osdep/mplayer.rc
windres -o $@ osdep/mplayer.rc