diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-01-14 15:54:58 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-01-14 15:54:58 +0000 |
| commit | 4bdd05e76fa8ba61805c168612e875c9b06947a2 (patch) | |
| tree | 46d90765f4a78cd369753e3c7f457942f9107ca8 /libavcodec | |
| parent | 1c7a8c17ff97ea4b6b10f1c4ff9ff4de30e3665a (diff) | |
| download | ffmpeg-4bdd05e76fa8ba61805c168612e875c9b06947a2.tar.gz | |
Move library name generation to configure, simplifies build system a bit more.
Originally committed as revision 4856 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 4 | ||||
| -rw-r--r-- | libavcodec/libpostproc/Makefile | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 5e3fd45cf0..fc91026afd 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -396,13 +396,11 @@ endif SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) OBJS := $(OBJS) $(ASM_OBJS) -LIB= $(LIBPREF)avcodec$(LIBSUF) +NAME=avcodec LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF) ifeq ($(BUILD_SHARED),yes) LIBVERSION=$(LAVCVERSION) LIBMAJOR=$(LAVCMAJOR) -NAME=avcodec -SLIBNAME= $(SLIBPREF)avcodec$(SLIBSUF) endif TESTS= imgresample-test dct-test motion-test fft-test diff --git a/libavcodec/libpostproc/Makefile b/libavcodec/libpostproc/Makefile index 3026b96f59..7ea52b2868 100644 --- a/libavcodec/libpostproc/Makefile +++ b/libavcodec/libpostproc/Makefile @@ -3,12 +3,10 @@ include ../../config.mak VPATH=$(SRC_PATH)/libavcodec/libpostproc -LIB = $(LIBPREF)postproc$(LIBSUF) +NAME=postproc ifeq ($(SHARED_PP),yes) LIBVERSION=$(SPPVERSION) LIBMAJOR=$(SPPMAJOR) -NAME=postproc -SLIBNAME = $(SLIBPREF)postproc$(SLIBSUF) endif OBJS=postprocess.o |