Revision c11c2bc2 libavcodec/Makefile

View differences:

libavcodec/Makefile
7 7
VPATH=$(SRC_PATH)/libavcodec
8 8

  
9 9
# NOTE: -I.. is needed to include config.h
10
CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $(AMR_CFLAGS)
10
CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $(AMR_CFLAGS)
11 11

  
12 12
OBJS= bitstream.o utils.o mem.o allcodecs.o \
13 13
      mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
......
16 16
      mpeg12.o mpegaudiodec.o pcm.o simple_idct.o \
17 17
      ratecontrol.o adpcm.o eval.o error_resilience.o \
18 18
      fft.o mdct.o raw.o golomb.o cabac.o\
19
      dpcm.o adx.o rational.o faandct.o parser.o g726.o \
20
      vp3dsp.o integer.o h264idct.o rangecoder.o pnm.o h263.o msmpeg4.o h263dec.o dvdsub.o dvbsub.o dvbsubdec.o
19
      dpcm.o adx.o faandct.o parser.o g726.o \
20
      vp3dsp.o h264idct.o rangecoder.o pnm.o h263.o msmpeg4.o h263dec.o dvdsub.o dvbsub.o dvbsubdec.o
21 21

  
22 22
ifeq ($(CONFIG_AASC_DECODER),yes)
23 23
    OBJS+= aasc.o
......
234 234
endif
235 235
endif
236 236

  
237
EXTRALIBS += -L$(SRC_PATH)/libavutil -lavutil$(BUILDSUF)
238

  
237 239
# currently using libdts for dts decoding
238 240
ifeq ($(CONFIG_DTS),yes)
239 241
OBJS+= dtsdec.o
......
375 377
OBJS := $(OBJS) $(ASM_OBJS)
376 378

  
377 379
LIB= $(LIBPREF)avcodec$(LIBSUF)
380
LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF)
378 381
ifeq ($(BUILD_SHARED),yes)
379 382
SLIB= $(SLIBPREF)avcodec$(SLIBSUF)
380 383
endif
......
446 449

  
447 450
# api example program
448 451
apiexample: apiexample.c $(LIB)
449
	$(CC) $(CFLAGS) -o $@ $< $(LIB) $(EXTRALIBS) -lm
452
	$(CC) $(CFLAGS) -o $@ $< $(LIB) $(LIBAVUTIL) $(EXTRALIBS) -lm
450 453

  
451 454
# cpuid test
452 455
cpuid_test: i386/cputest.c
......
464 467
	$(CC) -o $@ $^ -lm
465 468

  
466 469
fft-test: fft-test.o $(LIB)
467
	$(CC) -o $@ $^ -lm
470
	$(CC) -o $@ $^ $(LIBAVUTIL) -lm
468 471

  
469 472
ifeq ($(BUILD_SHARED),yes)
470 473
install: all install-headers
......
489 492
install-headers:
490 493
	mkdir -p "$(prefix)/include/ffmpeg"
491 494
	install -m 644 $(SRC_PATH)/libavcodec/avcodec.h \
492
	               $(SRC_PATH)/libavcodec/common.h \
493
	               $(SRC_PATH)/libavcodec/rational.h \
494 495
                "$(prefix)/include/ffmpeg"
495 496
	install -d $(libdir)/pkgconfig
496 497
	install -m 644 ../libavcodec.pc $(libdir)/pkgconfig

Also available in: Unified diff