From 1a48d8ee8b135ca9f8825952ce15ec3634b547ee Mon Sep 17 00:00:00 2001 From: Martin Molnar Date: Mon, 25 May 2009 21:57:02 +0200 Subject: [PATCH] Added autogenerated Makefiles --- libavcodec/Makefile.omk | 13 +++++++++---- libavdevice/Makefile.omk | 1 + libavfilter/Makefile.omk | 1 + libavformat/Makefile.omk | 3 +++ libavutil/Makefile.omk | 5 +++++ libpostproc/Makefile.omk | 1 + libswscale-omk/Makefile.omk | 2 ++ 7 files changed, 22 insertions(+), 4 deletions(-) diff --git a/libavcodec/Makefile.omk b/libavcodec/Makefile.omk index 09b31ef80..e090d536d 100644 --- a/libavcodec/Makefile.omk +++ b/libavcodec/Makefile.omk @@ -1,5 +1,6 @@ include $(srcdir)/../config.mak-omk + NAME = avcodec FFLIBS = avutil @@ -455,7 +456,7 @@ MMX-OBJS-$(CONFIG_VP6A_DECODER) += x86/vp3dsp_mmx.c x86/vp3dsp_sse2.c \ MMX-OBJS-$(CONFIG_VP6F_DECODER) += x86/vp3dsp_mmx.c x86/vp3dsp_sse2.c \ x86/vp6dsp_mmx.c x86/vp6dsp_sse2.c MMX-OBJS-$(CONFIG_WMV3_DECODER) += x86/vc1dsp_mmx.c -MMX-OBJS-$(HAVE_YASM) += x86/dsputil_yasm.c \ +MMX-OBJS-$(HAVE_YASM) += x86/dsputil_yasm.asm \ $(YASM-OBJS-yes) OBJS-$(HAVE_MMX) += x86/cpuid.c \ @@ -468,9 +469,6 @@ OBJS-$(HAVE_MMX) += x86/cpuid.c \ x86/mpegvideo_mmx.c \ x86/simple_idct_mmx.c \ -OBJS-$(HAVE_MMX) += $(MMX-OBJS-yes) $(MMX-OBJS-y) - - OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha.c \ alpha/dsputil_alpha_asm.c \ alpha/motion_est_alpha.c \ @@ -547,6 +545,13 @@ TESTPROGS = cabac dct eval fft h264 rangecoder snow TESTPROGS-$(ARCH_X86) += x86/cpuid TESTPROGS-$(HAVE_MMX) += motion +DIRS = alpha arm bfin mlib ppc ps2 sh4 sparc x86 + + +$(SUBDIR)dct-test$(EXESUF): $(SUBDIR)dctref.c + +OBJS-$(HAVE_MMX) += $(MMX-OBJS-yes) $(MMX-OBJS-y) + SUBDIRS=x86 lib_LIBRARIES:=$(NAME) diff --git a/libavdevice/Makefile.omk b/libavdevice/Makefile.omk index 0eb39b577..861c4c26c 100644 --- a/libavdevice/Makefile.omk +++ b/libavdevice/Makefile.omk @@ -1,5 +1,6 @@ include $(srcdir)/../config.mak-omk + NAME = avdevice FFLIBS = avformat avcodec avutil diff --git a/libavfilter/Makefile.omk b/libavfilter/Makefile.omk index 0fa090a5b..59bd8e063 100644 --- a/libavfilter/Makefile.omk +++ b/libavfilter/Makefile.omk @@ -1,5 +1,6 @@ include $(srcdir)/../config.mak-omk + NAME = avfilter FFLIBS = avcodec avutil swscale FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat diff --git a/libavformat/Makefile.omk b/libavformat/Makefile.omk index ecd38bfcf..7bb2504cb 100644 --- a/libavformat/Makefile.omk +++ b/libavformat/Makefile.omk @@ -1,5 +1,6 @@ include $(srcdir)/../config.mak-omk + NAME = avformat FFLIBS = avcodec avutil @@ -253,6 +254,8 @@ OBJS-$(CONFIG_JACK_DEMUXER) += timefilter.c EXAMPLES = output TESTPROGS = timefilter + +$(SUBDIR)output-example$(EXESUF): ELIBS = -lswscale lib_LIBRARIES:=$(NAME) $(NAME)_SOURCES:=$(OBJS) $(OBJS-y) $(OBJS-yes) renamed_include_HEADERS:=$(foreach h,$(HEADERS),$(h)->lib$(NAME)/$(h) ) diff --git a/libavutil/Makefile.omk b/libavutil/Makefile.omk index fcd6bcbcf..0908cc293 100644 --- a/libavutil/Makefile.omk +++ b/libavutil/Makefile.omk @@ -1,5 +1,6 @@ include $(srcdir)/../config.mak-omk + NAME = avutil HEADERS = adler32.h \ @@ -44,6 +45,10 @@ OBJS = adler32.c \ TESTPROGS = adler32 aes base64 crc des lls md5 pca sha1 softfloat tree TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo +DIRS = arm bfin sh4 x86 + + +$(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2 lib_LIBRARIES:=$(NAME) $(NAME)_SOURCES:=$(OBJS) $(OBJS-y) $(OBJS-yes) renamed_include_HEADERS:=$(foreach h,$(HEADERS),$(h)->lib$(NAME)/$(h) ) diff --git a/libpostproc/Makefile.omk b/libpostproc/Makefile.omk index 95e2eb207..1fa471739 100644 --- a/libpostproc/Makefile.omk +++ b/libpostproc/Makefile.omk @@ -1,5 +1,6 @@ include $(srcdir)/../config.mak-omk + NAME = postproc FFLIBS = avutil diff --git a/libswscale-omk/Makefile.omk b/libswscale-omk/Makefile.omk index 01c174ff6..57fd991a8 100644 --- a/libswscale-omk/Makefile.omk +++ b/libswscale-omk/Makefile.omk @@ -20,6 +20,8 @@ MMX-OBJS-$(CONFIG_GPL) += x86/yuv2rgb_mmx.c \ EXAMPLES = swscale TESTPROGS = colorspace +DIRS = bfin mlib ppc sparc x86 + lib_LIBRARIES:=$(NAME) $(NAME)_SOURCES:=$(OBJS) $(OBJS-y) $(OBJS-yes) renamed_include_HEADERS:=$(foreach h,$(HEADERS),$(h)->lib$(NAME)/$(h) ) -- 2.39.2