diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2005-03-11 11:34:31 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-03-11 11:34:31 +0000 |
| commit | efd9e75cb0bf2e80ee0fdfd14689e26cd5888117 (patch) | |
| tree | 8ce2d6d94736f7d27b8014150223b57c44d5a433 /libavformat | |
| parent | 4e4d983e8be8b37e254c261f92dc1161f2712cbd (diff) | |
| download | ffmpeg-efd9e75cb0bf2e80ee0fdfd14689e26cd5888117.tar.gz | |
fix lib order and remove nonsense avcodec double linking
Originally committed as revision 4029 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 5ecd750f5a..42245427b3 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -55,8 +55,6 @@ endif ifeq ($(CONFIG_AUDIO_BEOS),yes) PPOBJS+= beosaudio.o EXTRALIBS+=-lbe -lmedia -# this should be the default ! -EXTRALIBS+=-lavcodec -L../libavcodec endif ifeq ($(CONFIG_NETWORK),yes) @@ -78,11 +76,11 @@ endif LIB= $(LIBPREF)avformat$(LIBSUF) ifeq ($(BUILD_SHARED),yes) SLIB= $(SLIBPREF)avformat$(SLIBSUF) -endif -EXTRALIBS+=-lavcodec -L../libavcodec +AVCLIBS+=-lavcodec -L../libavcodec ifeq ($(CONFIG_MP3LAME),yes) -EXTRALIBS+=-lmp3lame +AVCLIBS+=-lmp3lame +endif endif SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp) @@ -96,10 +94,10 @@ $(LIB): $(OBJS) $(PPOBJS) $(SLIB): $(OBJS) ifeq ($(CONFIG_WIN32),yes) - $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll + $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll -lib /machine:i386 /def:$(@:.dll=.def) else - $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) + $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS) endif depend: $(SRCS) |