Skip to content

Commit

Permalink
cosmetic: move some makefile variable definitions
Browse files Browse the repository at this point in the history
Originally committed as revision 22392 to svn://svn.ffmpeg.org/ffmpeg/trunk
  • Loading branch information
mansr committed Mar 9, 2010
1 parent 7acc010 commit 477b338
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions subdir.mak
Expand Up @@ -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

Expand All @@ -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)
Expand Down

0 comments on commit 477b338

Please sign in to comment.