Mercurial > mplayer.hg

comparison Makefile @ 21130:44dcb71f9751

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Split libs that are dependencies and those that are just linker flags. Fixes spurious rebuilds of MPlayer and MEncoder.
author diego
date Tue, 21 Nov 2006 17:42:20 +0000
parents ef9e23c5ef5b
children 2607e9c60efd
comparison
equal deleted inserted replaced
21129:2ba65302eb17 21130:44dcb71f9751
65 osdep/libosdep.a \ 65 osdep/libosdep.a \
66 66
67 LIBS_MPLAYER = libvo/libvo.a \ 67 LIBS_MPLAYER = libvo/libvo.a \
68 libao2/libao2.a \ 68 libao2/libao2.a \
69 input/libinput.a \ 69 input/libinput.a \
70 $(EXTRALIBS_MPLAYER) \
71 $(COMMON_LIBS) \
72 70
73 LIBS_MENCODER = libmpcodecs/libmpencoders.a \ 71 LIBS_MENCODER = libmpcodecs/libmpencoders.a \
74 $(EXTRALIBS_MENCODER) \
75 $(COMMON_LIBS) \
76 72
77 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o) 73 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
78 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o) 74 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
79 75
80 MPLAYER_DEPS = $(OBJS_MPLAYER) $(LIBS_MPLAYER) $(COMMON_LIBS) 76 MPLAYER_DEPS = $(OBJS_MPLAYER) $(LIBS_MPLAYER) $(COMMON_LIBS)
160 endif 156 endif
161 ifeq ($(TARGET_WIN32),yes) 157 ifeq ($(TARGET_WIN32),yes)
162 OBJS_MPLAYER += osdep/mplayer-rc.o 158 OBJS_MPLAYER += osdep/mplayer-rc.o
163 endif 159 endif
164 160
165 COMMON_LIBS += $(EXTRA_LIB)\ 161 COMMON_LDFLAGS += $(EXTRA_LIB)\
166 $(EXTRALIBS) \ 162 $(EXTRALIBS) \
163
164 LDFLAGS_MPLAYER = $(EXTRALIBS_MPLAYER) \
165 $(COMMON_LDFLAGS) \
166
167 LDFLAGS_MENCODER = $(EXTRALIBS_MENCODER) \
168 $(COMMON_LIBS) \
167 169
168 ifeq ($(MPLAYER),yes) 170 ifeq ($(MPLAYER),yes)
169 ALL_PRG = mplayer$(EXESUF) 171 ALL_PRG = mplayer$(EXESUF)
170 endif 172 endif
171 ifeq ($(MENCODER),yes) 173 ifeq ($(MENCODER),yes)
262 264
263 libmenu/libmenu.a: 265 libmenu/libmenu.a:
264 $(MAKE) -C libmenu 266 $(MAKE) -C libmenu
265 267
266 mplayer$(EXESUF): $(MPLAYER_DEPS) 268 mplayer$(EXESUF): $(MPLAYER_DEPS)
267 $(CC) -o $@ $(OBJS_MPLAYER) $(LIBS_MPLAYER) 269 $(CC) -o $@ $^ $(LDFLAGS_MPLAYER)
268 270
269 mencoder$(EXESUF): $(MENCODER_DEPS) 271 mencoder$(EXESUF): $(MENCODER_DEPS)
270 $(CC) -o $@ $(OBJS_MENCODER) $(LIBS_MENCODER) 272 $(CC) -o $@ $^ $(LDFLAGS_MENCODER)
271 273
272 osdep/mplayer-rc.o: osdep/mplayer.rc 274 osdep/mplayer-rc.o: osdep/mplayer.rc
273 windres -o $@ osdep/mplayer.rc 275 windres -o $@ osdep/mplayer.rc
274 276
275 codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h 277 codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h