diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-03-09 14:58:11 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-03-09 14:58:11 +0000 |
| commit | 477b338266de65a91b8d18dbdbc72ed104de6db9 (patch) | |
| tree | a3c5a7383ebfa0c33e8470ecdb2a7d4cd83e8314 /subdir.mak | |
| parent | 7acc01042e5eeeaa5ba1a44e6215b43ceafa78e9 (diff) | |
| download | ffmpeg-477b338266de65a91b8d18dbdbc72ed104de6db9.tar.gz | |
cosmetic: move some makefile variable definitions
Originally committed as revision 22392 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'subdir.mak')
| -rw-r--r-- | subdir.mak | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/subdir.mak b/subdir.mak index da61458df6..44e1505a47 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) |