prettyprinting cosmetics

Originally committed as revision 18188 to svn://svn.ffmpeg.org/ffmpeg/trunk
release/0.6
Diego Biurrun 16 years ago
parent e43f34bd44
commit 6ccf540fa5
  1. 24
      common.mak

@ -5,9 +5,9 @@
all: # make "all" default target all: # make "all" default target
ifndef SUBDIR ifndef SUBDIR
vpath %.c $(SRC_DIR) vpath %.c $(SRC_DIR)
vpath %.h $(SRC_DIR) vpath %.h $(SRC_DIR)
vpath %.S $(SRC_DIR) vpath %.S $(SRC_DIR)
vpath %.asm $(SRC_DIR) vpath %.asm $(SRC_DIR)
ifeq ($(SRC_DIR),$(SRC_PATH_BARE)) ifeq ($(SRC_DIR),$(SRC_PATH_BARE))
@ -57,19 +57,19 @@ uninstall: uninstall-libs uninstall-headers
.PHONY: all depend dep *clean install* uninstall* examples testprogs .PHONY: all depend dep *clean install* uninstall* examples testprogs
endif endif
CFLAGS += $(CFLAGS-yes) CFLAGS += $(CFLAGS-yes)
OBJS += $(OBJS-yes) OBJS += $(OBJS-yes)
FFLIBS := $(FFLIBS-yes) $(FFLIBS) FFLIBS := $(FFLIBS-yes) $(FFLIBS)
TESTPROGS += $(TESTPROGS-yes) TESTPROGS += $(TESTPROGS-yes)
FFEXTRALIBS := $(addprefix -l,$(addsuffix $(BUILDSUF),$(FFLIBS))) $(EXTRALIBS) FFEXTRALIBS := $(addprefix -l,$(addsuffix $(BUILDSUF),$(FFLIBS))) $(EXTRALIBS)
FFLDFLAGS := $(addprefix -L$(BUILD_ROOT)/lib,$(FFLIBS)) $(LDFLAGS) FFLDFLAGS := $(addprefix -L$(BUILD_ROOT)/lib,$(FFLIBS)) $(LDFLAGS)
EXAMPLES := $(addprefix $(SUBDIR),$(EXAMPLES)) EXAMPLES := $(addprefix $(SUBDIR),$(EXAMPLES))
OBJS := $(addprefix $(SUBDIR),$(OBJS)) OBJS := $(addprefix $(SUBDIR),$(OBJS))
TESTPROGS := $(addprefix $(SUBDIR),$(TESTPROGS)) TESTPROGS := $(addprefix $(SUBDIR),$(TESTPROGS))
DEP_LIBS:=$(foreach NAME,$(FFLIBS),lib$(NAME)/$($(BUILD_SHARED:yes=S)LIBNAME)) DEP_LIBS := $(foreach NAME,$(FFLIBS),lib$(NAME)/$($(BUILD_SHARED:yes=S)LIBNAME))
ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h)) ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h))
checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho)) checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho))
@ -77,9 +77,9 @@ checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho))
DEPS := $(OBJS:.o=.d) DEPS := $(OBJS:.o=.d)
depend dep: $(DEPS) depend dep: $(DEPS)
CLEANSUFFIXES = *.o *~ *.ho CLEANSUFFIXES = *.o *~ *.ho
LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a *.exp *.map
DISTCLEANSUFFIXES = *.d *.pc DISTCLEANSUFFIXES = *.d *.pc
LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a *.exp *.map
define RULES define RULES
$(SUBDIR)%$(EXESUF): $(SUBDIR)%.o $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o

Loading…
Cancel
Save