diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-11-20 22:53:18 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-11-20 22:53:18 +0000 |
| commit | f0e602351eadd2f5f465ff29c140b376646fd8dd (patch) | |
| tree | 93aca86012f1e3ccafb365f5b563006d9e54f7ed | |
| parent | 0d2d0f97a58d12d5804bf913348e498fac2cd25c (diff) | |
| download | ffmpeg-f0e602351eadd2f5f465ff29c140b376646fd8dd.tar.gz | |
cosmetics: Consistently place HEADERS before OBJS in all Makefiles.
Originally committed as revision 15896 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/Makefile | 5 | ||||
| -rw-r--r-- | libavfilter/Makefile | 4 | ||||
| -rw-r--r-- | libavformat/Makefile | 4 | ||||
| -rw-r--r-- | libavutil/Makefile | 34 |
4 files changed, 23 insertions, 24 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1ee8425e47..f4c4ce7f66 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -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 diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 1cd4992442..9da8f910bc 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -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 diff --git a/libavformat/Makefile b/libavformat/Makefile index de5cae2ab7..18d89da35f 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -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 diff --git a/libavutil/Makefile b/libavutil/Makefile index bcbc9b3c9a..be2f3e1e09 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -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 |