diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-10-19 09:56:18 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-10-19 09:56:18 +0000 |
| commit | fc1b468117d333ca5630f7842a4c3d412389ec91 (patch) | |
| tree | 0097e97a7be1e90d37b3749bceaf80a26d45cc64 /Makefile | |
| parent | d87e0718d832901ae782134c1f8192d39cf5368e (diff) | |
| download | mpv-fc1b468117d333ca5630f7842a4c3d412389ec91.tar.bz2 mpv-fc1b468117d333ca5630f7842a4c3d412389ec91.tar.xz | |
Get rid of COMMON_LDFLAGS variable. It was a pointless indirection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29784 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -24,9 +24,6 @@ include config.mak ###### variable declarations ####### -COMMON_LDFLAGS += $(EXTRA_LIB)\ - $(EXTRALIBS) \ - SRCS_AUDIO_INPUT-$(ALSA1X) += stream/ai_alsa1x.c SRCS_AUDIO_INPUT-$(ALSA9) += stream/ai_alsa.c SRCS_AUDIO_INPUT-$(OSS) += stream/ai_oss.c @@ -835,11 +832,11 @@ $(FFMPEGLIBS): $(FFMPEGFILES) config.h touch $@ mencoder$(EXESUF): $(MENCODER_DEPS) -mencoder$(EXESUF): COMMON_LDFLAGS += $(EXTRALIBS_MENCODER) +mencoder$(EXESUF): EXTRALIBS += $(EXTRALIBS_MENCODER) mplayer$(EXESUF): $(MPLAYER_DEPS) -mplayer$(EXESUF): COMMON_LDFLAGS += $(EXTRALIBS_MPLAYER) +mplayer$(EXESUF): EXTRALIBS += $(EXTRALIBS_MPLAYER) mencoder$(EXESUF) mplayer$(EXESUF): - $(CC) -o $@ $^ $(COMMON_LDFLAGS) + $(CC) -o $@ $^ $(EXTRALIBS) codec-cfg$(EXESUF): codec-cfg.c help_mp.h $(HOST_CC) -O -DCODECS2HTML -I. -o $@ $< @@ -1046,7 +1043,7 @@ mplayer-nomain.o: mplayer.c TOOLS/netstream$(EXESUF): TOOLS/netstream.c TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c TOOLS/netstream$(EXESUF) TOOLS/vivodump$(EXESUF): $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) $(OBJS_COMMON) $(COMMON_LIBS) - $(CC) $(CFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(COMMON_LDFLAGS) + $(CC) $(CFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(EXTRALIBS) REAL_SRCS = $(wildcard TOOLS/realcodecs/*.c) REAL_TARGETS = $(REAL_SRCS:.c=.so.6.0) |