# HG changeset patch # User diego # Date 1137254098 0 # Node ID ed98beb48872ffff48f3a892a46276c0ccb3160b # Parent 583020ce54a8a304d4f53ba899567fcdf2272994 Move library name generation to configure, simplifies build system a bit more. diff -r 583020ce54a8 -r ed98beb48872 Makefile --- a/Makefile Sat Jan 14 15:00:10 2006 +0000 +++ b/Makefile Sat Jan 14 15:54:58 2006 +0000 @@ -396,13 +396,11 @@ 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 -r 583020ce54a8 -r ed98beb48872 libpostproc/Makefile --- a/libpostproc/Makefile Sat Jan 14 15:00:10 2006 +0000 +++ b/libpostproc/Makefile Sat Jan 14 15:54:58 2006 +0000 @@ -3,12 +3,10 @@ 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