From 477b338266de65a91b8d18dbdbc72ed104de6db9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Tue, 9 Mar 2010 14:58:11 +0000 Subject: [PATCH] cosmetic: move some makefile variable definitions Originally committed as revision 22392 to svn://svn.ffmpeg.org/ffmpeg/trunk --- subdir.mak | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/subdir.mak b/subdir.mak index da61458df68..44e1505a478 100644 --- a/subdir.mak +++ b/subdir.mak @@ -4,6 +4,8 @@ include $(SUBDIR)../common.mak LIBVERSION := $(lib$(NAME)_VERSION) LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR) +INCINSTDIR := $(INCDIR)/lib$(NAME) +THIS_LIB := $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME) $(OBJS) $(SUBDIR)%.ho $(SUBDIR)%-test.o $(TESTOBJS): CPPFLAGS += -DHAVE_AV_CONFIG_H @@ -20,10 +22,6 @@ endif install-headers: install-lib$(NAME)-headers install-lib$(NAME)-pkgconfig -INCINSTDIR := $(INCDIR)/lib$(NAME) - -THIS_LIB := $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME) - define RULES $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o $$(LD) $(FFLDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS) -- 2.39.2