[SCM] libav/experimental: Simplify conditional compilation handling.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:55:32 UTC 2013
The following commit has been merged in the experimental branch:
commit 91f2de5e1894350c6b43a6ede759ad2f6a7c9a9b
Author: Diego Biurrun <diego at biurrun.de>
Date: Thu Jan 25 00:35:29 2007 +0000
Simplify conditional compilation handling.
Originally committed as revision 22009 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
diff --git a/libswscale/Makefile b/libswscale/Makefile
index c65a3a9..d9b67da 100644
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -10,12 +10,9 @@ endif
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
OBJS= swscale.o rgb2rgb.o
-ifeq ($(TARGET_ALTIVEC),yes)
-OBJS+= yuv2rgb_altivec.o
-endif
-ifeq ($(CONFIG_GPL),yes)
-OBJS+= yuv2rgb.o
-endif
+
+OBJS-$(TARGET_ALTIVEC) += yuv2rgb_altivec.o
+OBJS-$(CONFIG_GPL) += yuv2rgb.o
HEADERS = swscale.h rgb2rgb.h
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list