Commit f0e60235 authored by Diego Biurrun's avatar Diego Biurrun
Browse files

cosmetics: Consistently place HEADERS before OBJS in all Makefiles.

Originally committed as revision 15896 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 0d2d0f97
......@@ -3,6 +3,8 @@ include $(SUBDIR)../config.mak
NAME = avcodec
FFLIBS = avutil
HEADERS = avcodec.h opt.h
OBJS = allcodecs.o \
audioconvert.o \
bitstream.o \
......@@ -20,9 +22,6 @@ OBJS = allcodecs.o \
simple_idct.o \
utils.o \
HEADERS = avcodec.h opt.h
# parts needed for many different codecs
OBJS-$(CONFIG_ENCODERS) += faandct.o jfdctfst.o jfdctint.o
OBJS-$(CONFIG_FFT) += fft.o
......
......@@ -5,6 +5,8 @@ FFLIBS = avcodec avutil
FFLIBS-$(CONFIG_SWSCALE) += swscale
FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat
HEADERS = avfilter.h
OBJS = allfilters.o \
avfilter.o \
defaults.o \
......@@ -12,6 +14,4 @@ OBJS = allfilters.o \
#OBJS-$(CONFIG_XXX_FILTER) += vf_xxx.o
HEADERS = avfilter.h
include $(SUBDIR)../subdir.mak
......@@ -3,10 +3,10 @@ include $(SUBDIR)../config.mak
NAME = avformat
FFLIBS = avcodec avutil
OBJS = allformats.o cutils.o os_support.o sdp.o utils.o
HEADERS = avformat.h avio.h rtsp.h rtspcodes.h
OBJS = allformats.o cutils.o os_support.o sdp.o utils.o
# muxers/demuxers
OBJS-$(CONFIG_AAC_DEMUXER) += raw.o
OBJS-$(CONFIG_AC3_DEMUXER) += raw.o
......
......@@ -2,6 +2,23 @@ include $(SUBDIR)../config.mak
NAME = avutil
HEADERS = adler32.h \
avstring.h \
avutil.h \
base64.h \
common.h \
crc.h \
fifo.h \
intfloat_readwrite.h \
log.h \
lzo.h \
mathematics.h \
md5.h \
mem.h \
random.h \
rational.h \
sha1.h
OBJS = adler32.o \
aes.o \
base64.o \
......@@ -24,23 +41,6 @@ OBJS = adler32.o \
tree.o \
utils.o \
HEADERS = adler32.h \
avstring.h \
avutil.h \
base64.h \
common.h \
crc.h \
fifo.h \
intfloat_readwrite.h \
log.h \
lzo.h \
mathematics.h \
md5.h \
mem.h \
random.h \
rational.h \
sha1.h
TESTS = $(addsuffix -test$(EXESUF), adler32 aes crc des lls md5 pca random sha1 softfloat tree)
include $(SUBDIR)../subdir.mak
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment