diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-21 17:42:20 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-21 17:42:20 +0000 |
| commit | 37fd66bd41ecdf59903cf166898fc70991a8a15d (patch) | |
| tree | 959eb36d1368caa9211505f9f8cce5726b8719b2 /Makefile | |
| parent | 738e5816b9c0fca7472d9b727e050c2be291a7d4 (diff) | |
| download | mpv-37fd66bd41ecdf59903cf166898fc70991a8a15d.tar.bz2 mpv-37fd66bd41ecdf59903cf166898fc70991a8a15d.tar.xz | |
Split libs that are dependencies and those that are just linker flags.
Fixes spurious rebuilds of MPlayer and MEncoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21146 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -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 |