[FFmpeg-cvslog] r22392 - trunk/subdir.mak
mru
subversion
Tue Mar 9 15:58:12 CET 2010
Author: mru
Date: Tue Mar 9 15:58:11 2010
New Revision: 22392
Log:
cosmetic: move some makefile variable definitions
Modified:
trunk/subdir.mak
Modified: trunk/subdir.mak
==============================================================================
--- trunk/subdir.mak Tue Mar 9 15:58:08 2010 (r22391)
+++ trunk/subdir.mak Tue Mar 9 15:58:11 2010 (r22392)
@@ -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)
More information about the ffmpeg-cvslog
mailing list