# HG changeset patch # User diego # Date 1164130940 0 # Node ID 44dcb71f9751a6689fa326bea23a47e77d953ae9 # Parent 2ba65302eb1705118aae2587d5adaf0d12ed5a25 Split libs that are dependencies and those that are just linker flags. Fixes spurious rebuilds of MPlayer and MEncoder. diff -r 2ba65302eb17 -r 44dcb71f9751 Makefile --- 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