cosmetic: move some makefile variable definitions

Originally committed as revision 22392 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/subdir.mak b/subdir.mak
index da61458df68a39b29d19fbb45bf3fcb05f39ee3e..44e1505a478d4d89c5e24277ea8c3c1dc2e7200d 100644 (file)
--- 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)