Mercurial > mplayer.hg

changeset 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 2ba65302eb17
children 2607e9c60efd
files Makefile
diffstat 1 files changed, 10 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Nov 21 17:36:39 2006 +0000
+++ b/Makefile	Tue Nov 21 17:42:20 2006 +0000
@@ -67,12 +67,8 @@
 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 @@
 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 @@
 	$(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