http: Reorder two code blocks

[ffmpeg] / libavfilter / Makefile

diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index efb766785e00f7ede9599d89326170530bc60095..e9eaf9550d7c24053cb05c02911365f235d775a0 100644 (file)
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -1,46 +1,78 @@
-include ../config.mak
-
-CFLAGS+=-I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libswscale
-
-OBJS = allfilters.o \
-       avfilter.o \
-       avfiltergraph.o \
-       avfiltergraphdesc.o \
-       defaults.o \
-       formats.o \
-       avfiltergraphfile.o \
-
-# TODO: real conditional compilation
-
-
-OBJS-$(CONFIG_VF_CROP)       += vf_crop.o
-OBJS-$(CONFIG_VF_FPS)        += vf_fps.o
-OBJS-$(CONFIG_VF_HFLIP)      += vf_hflip.o
-OBJS-$(CONFIG_VF_NEGATE)     += vf_negate.o
-OBJS-$(CONFIG_VF_FIFO)       += vf_fifo.o
-OBJS-$(CONFIG_VF_FORMAT)     += vf_format.o
-OBJS-$(CONFIG_VF_OVERLAY)    += vf_overlay.o
-OBJS-$(CONFIG_VF_ROTATE)     += vf_rotate.o
-OBJS-$(CONFIG_VF_SCALE)      += vf_scale.o
-OBJS-$(CONFIG_VF_SETPTS)     += vf_setpts.o
-OBJS-$(CONFIG_VF_SLICIFY)    += vf_slicify.o
-OBJS-$(CONFIG_VF_SPLIT)      += vf_split.o
-OBJS-$(CONFIG_VF_TRANSPOSE)  += vf_transpose.o
-OBJS-$(CONFIG_VF_VFLIP)      += vf_vflip.o
-OBJS-$(CONFIG_AVFILTER_LAVF) += vsrc_movie.o
-
-HEADERS = avfilter.h
-
-EXTRALIBS := -L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) \
-             -L$(BUILD_ROOT)/libswscale -lswscale$(BUILDSUF) \
-             -L$(BUILD_ROOT)/libavutil  -lavutil$(BUILDSUF) $(EXTRALIBS)
-
-ifeq ($(CONFIG_AVFILTER_LAVF),yes)
-EXTRALIBS := -L$(BUILD_ROOT)/libavformat -lavformat$(BUILDSUF) $(EXTRALIBS)
-endif
-
-NAME=avfilter
-LIBVERSION=$(LAVFILTERVERSION)
-LIBMAJOR=$(LAVFILTERMAJOR)
-
-include ../common.mak
+NAME = avfilter
+FFLIBS = avutil
+FFLIBS-$(CONFIG_MOVIE_FILTER) += avformat avcodec
+FFLIBS-$(CONFIG_SCALE_FILTER) += swscale
+
+HEADERS = avfilter.h avfiltergraph.h
+
+OBJS = allfilters.o                                                     \
+       avfilter.o                                                       \
+       avfiltergraph.o                                                  \
+       defaults.o                                                       \
+       drawutils.o                                                      \
+       formats.o                                                        \
+       graphparser.o                                                    \
+
+OBJS-$(CONFIG_ANULL_FILTER)                  += af_anull.o
+
+OBJS-$(CONFIG_ANULLSRC_FILTER)               += asrc_anullsrc.o
+
+OBJS-$(CONFIG_ANULLSINK_FILTER)              += asink_anullsink.o
+
+OBJS-$(CONFIG_BLACKFRAME_FILTER)             += vf_blackframe.o
+OBJS-$(CONFIG_BOXBLUR_FILTER)                += vf_boxblur.o
+OBJS-$(CONFIG_COPY_FILTER)                   += vf_copy.o
+OBJS-$(CONFIG_CROP_FILTER)                   += vf_crop.o
+OBJS-$(CONFIG_CROPDETECT_FILTER)             += vf_cropdetect.o
+OBJS-$(CONFIG_DELOGO_FILTER)                 += vf_delogo.o
+OBJS-$(CONFIG_DRAWBOX_FILTER)                += vf_drawbox.o
+OBJS-$(CONFIG_DRAWTEXT_FILTER)               += vf_drawtext.o
+OBJS-$(CONFIG_FADE_FILTER)                   += vf_fade.o
+OBJS-$(CONFIG_FIELDORDER_FILTER)             += vf_fieldorder.o
+OBJS-$(CONFIG_FIFO_FILTER)                   += vf_fifo.o
+OBJS-$(CONFIG_FORMAT_FILTER)                 += vf_format.o
+OBJS-$(CONFIG_FREI0R_FILTER)                 += vf_frei0r.o
+OBJS-$(CONFIG_GRADFUN_FILTER)                += vf_gradfun.o
+OBJS-$(CONFIG_HFLIP_FILTER)                  += vf_hflip.o
+OBJS-$(CONFIG_HQDN3D_FILTER)                 += vf_hqdn3d.o
+OBJS-$(CONFIG_LUT_FILTER)                    += vf_lut.o
+OBJS-$(CONFIG_LUTRGB_FILTER)                 += vf_lut.o
+OBJS-$(CONFIG_LUTYUV_FILTER)                 += vf_lut.o
+OBJS-$(CONFIG_NEGATE_FILTER)                 += vf_lut.o
+OBJS-$(CONFIG_NOFORMAT_FILTER)               += vf_format.o
+OBJS-$(CONFIG_NULL_FILTER)                   += vf_null.o
+OBJS-$(CONFIG_OCV_FILTER)                    += vf_libopencv.o
+OBJS-$(CONFIG_OVERLAY_FILTER)                += vf_overlay.o
+OBJS-$(CONFIG_PAD_FILTER)                    += vf_pad.o
+OBJS-$(CONFIG_PIXDESCTEST_FILTER)            += vf_pixdesctest.o
+OBJS-$(CONFIG_SCALE_FILTER)                  += vf_scale.o
+OBJS-$(CONFIG_SELECT_FILTER)                 += vf_select.o
+OBJS-$(CONFIG_SETDAR_FILTER)                 += vf_aspect.o
+OBJS-$(CONFIG_SETPTS_FILTER)                 += vf_setpts.o
+OBJS-$(CONFIG_SETSAR_FILTER)                 += vf_aspect.o
+OBJS-$(CONFIG_SETTB_FILTER)                  += vf_settb.o
+OBJS-$(CONFIG_SHOWINFO_FILTER)               += vf_showinfo.o
+OBJS-$(CONFIG_SLICIFY_FILTER)                += vf_slicify.o
+OBJS-$(CONFIG_SPLIT_FILTER)                  += vf_split.o
+OBJS-$(CONFIG_TRANSPOSE_FILTER)              += vf_transpose.o
+OBJS-$(CONFIG_UNSHARP_FILTER)                += vf_unsharp.o
+OBJS-$(CONFIG_VFLIP_FILTER)                  += vf_vflip.o
+OBJS-$(CONFIG_YADIF_FILTER)                  += vf_yadif.o
+
+OBJS-$(CONFIG_BUFFER_FILTER)                 += vsrc_buffer.o
+OBJS-$(CONFIG_COLOR_FILTER)                  += vsrc_color.o
+OBJS-$(CONFIG_FREI0R_SRC_FILTER)             += vf_frei0r.o
+OBJS-$(CONFIG_MOVIE_FILTER)                  += vsrc_movie.o
+OBJS-$(CONFIG_NULLSRC_FILTER)                += vsrc_nullsrc.o
+OBJS-$(CONFIG_RGBTESTSRC_FILTER)             += vsrc_testsrc.o
+OBJS-$(CONFIG_TESTSRC_FILTER)                += vsrc_testsrc.o
+
+OBJS-$(CONFIG_NULLSINK_FILTER)               += vsink_nullsink.o
+
+-include $(SRC_PATH)/$(SUBDIR)$(ARCH)/Makefile
+
+DIRS = x86
+
+TOOLS = graph2dot lavfi-showfiltfmts
+
+include $(SRC_PATH)/subdir.mak