diff options
| author | Måns Rullgård <mans@mansr.com> | 2008-04-07 22:17:47 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2008-04-07 22:17:47 +0000 |
| commit | 8e255b8bda61e99e18d8aed456fa0131012acca6 (patch) | |
| tree | 7b9db12a10a17cdaa5419f46a5810b132df05d94 | |
| parent | dbe6c6ff00bf57b709d0705a21efe64927d6e9dc (diff) | |
| download | ffmpeg-8e255b8bda61e99e18d8aed456fa0131012acca6.tar.gz | |
replace some ifeq with prettier ifdef
Originally committed as revision 12764 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | common.mak | 2 | ||||
| -rw-r--r-- | libavcodec/Makefile | 4 | ||||
| -rw-r--r-- | subdir.mak | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/common.mak b/common.mak index 66297ef5a1..62dddcd5cf 100644 --- a/common.mak +++ b/common.mak @@ -4,7 +4,7 @@ all: # make "all" default target -ifeq ($(SUBDIR),) +ifndef SUBDIR vpath %.c $(SRC_DIR) vpath %.h $(SRC_DIR) vpath %.S $(SRC_DIR) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3652464c7e..a47f04b70c 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -362,12 +362,12 @@ OBJS-$(HAVE_W32THREADS) += w32thread.o OBJS-$(HAVE_XVMC) += xvmcvideo.o -ifneq ($(CONFIG_SWSCALE),yes) +ifndef CONFIG_SWSCALE OBJS += imgresample.o endif # processor-specific code -ifeq ($(HAVE_MMX),yes) +ifdef HAVE_MMX OBJS += i386/fdct_mmx.o \ i386/cputest.o \ i386/dsputil_mmx.o \ diff --git a/subdir.mak b/subdir.mak index 6384d8baf8..5b92f78566 100644 --- a/subdir.mak +++ b/subdir.mak @@ -19,7 +19,7 @@ endif INCINSTDIR := $(INCDIR)/lib$(NAME) define RULES -ifeq ($(BUILD_SHARED),yes) +ifdef BUILD_SHARED all: $(SUBDIR)$(SLIBNAME) install-libs: install-lib$(NAME)-shared @@ -32,7 +32,7 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(CC) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$^ $(FFEXTRALIBS) $(EXTRAOBJS) $(SLIB_EXTRA_CMD) -ifneq ($(SUBDIR),) +ifdef SUBDIR $(SUBDIR)$(SLIBNAME_WITH_MAJOR): \ $(foreach L,$(FFLIBS),lib$(L)/$(SLIBPREF)$(L)$(SLIBSUF)) endif |