Revision 1a9150b1

View differences:

Makefile
67 67
	$(MAKE) -C libavutil all
68 68
	$(MAKE) -C libavcodec all
69 69
	$(MAKE) -C libavformat all
70
ifeq ($(CONFIG_PP),yes)
71
	$(MAKE) -C libavcodec/libpostproc all
72
endif
70 73

  
71 74
ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
72 75
	$(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
......
140 143
	$(MAKE) -C libavutil   install-lib-shared
141 144
	$(MAKE) -C libavcodec  install-lib-shared
142 145
	$(MAKE) -C libavformat install-lib-shared
146
ifeq ($(CONFIG_PP),yes)
147
	$(MAKE) -C libavcodec/libpostproc install-lib-shared
148
endif
143 149
	$(LDCONFIG) || true
144 150
endif
145 151
ifeq ($(BUILD_STATIC),yes)
146 152
	$(MAKE) -C libavutil   install-lib-static
147 153
	$(MAKE) -C libavcodec  install-lib-static
148 154
	$(MAKE) -C libavformat install-lib-static
155
ifeq ($(CONFIG_PP),yes)
156
	$(MAKE) -C libavcodec/libpostproc install-lib-static
157
endif
149 158
endif
150 159

  
151 160
install-headers:
......
154 163
	$(MAKE) -C libavutil   install-headers
155 164
	$(MAKE) -C libavcodec  install-headers
156 165
	$(MAKE) -C libavformat install-headers
166
ifeq ($(CONFIG_PP),yes)
167
	$(MAKE) -C libavcodec/libpostproc install-headers
168
endif
157 169

  
158 170
dep:	depend
159 171

  
......
175 187
	$(MAKE) -C libavutil clean
176 188
	$(MAKE) -C libavcodec clean
177 189
	$(MAKE) -C libavformat clean
190
	$(MAKE) -C libavcodec/libpostproc clean
178 191
	$(MAKE) -C tests clean
179 192
	$(MAKE) -C vhook clean
180 193
	rm -f *.o *.d *~ .libs gmon.out TAGS \
......
185 198
	$(MAKE) -C libavutil   distclean
186 199
	$(MAKE) -C libavcodec  distclean
187 200
	$(MAKE) -C libavformat distclean
201
	$(MAKE) -C libavcodec/libpostproc distclean
188 202
	$(MAKE) -C tests       distclean
189 203
	$(MAKE) -C vhook       distclean
190 204
	rm -f .depend config.mak config.h *.pc
libavcodec/Makefile
300 300
OBJS+= x264.o
301 301
endif
302 302

  
303
ifeq ($(CONFIG_PP),yes)
304
ifeq ($(BUILD_SHARED),yes)
305
EXTRALIBS += -Llibpostproc -lpostproc$(BUILDSUF)
306
else
307
# LIBS += libpostproc/libpostproc.a ... should be fixed
308
OBJS += libpostproc/postprocess.o
309
endif
310
endif
311

  
312 303
ifeq ($(CONFIG_MP3LAME),yes)
313 304
OBJS += mp3lameaudio.o
314 305
endif
......
428 419
	$(RANLIB) $@
429 420

  
430 421
$(SLIBNAME): $(OBJS)
431
ifeq ($(CONFIG_PP),yes)
432
	$(MAKE) -C libpostproc
433
endif
434 422
	$(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
435 423
ifeq ($(CONFIG_WIN32),yes)
436 424
	-lib /machine:i386 /def:$(@:.dll=.def)
......
438 426

  
439 427
dsputil.o: dsputil.c dsputil.h
440 428

  
441
libpostproc/libpostproc.a:
442
	$(MAKE) -C libpostproc
443

  
444 429
%.o: %.c
445 430
	$(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
446 431

  
......
465 450
	   sparc/*.o sparc/*~ \
466 451
	   liba52/*.o liba52/*~ \
467 452
	   apiexample $(TESTS)
468
	$(MAKE) -C libpostproc clean
469 453

  
470 454
distclean: clean
471 455
	rm -f .depend
472
	$(MAKE) -C libpostproc distclean
473 456

  
474 457
cleanamr:
475 458
	$(MAKE) -C amr clean
......
514 497
	ln -sf $(SLIBNAME_WITH_VERSION) \
515 498
		$(libdir)/$(SLIBNAME)
516 499
endif
517
ifeq ($(CONFIG_PP),yes)
518
	$(MAKE) -C libpostproc $@
519
endif
520 500

  
521 501
install-lib-static: $(LIB)
522 502
	install -m 644 $(LIB) "$(libdir)"
523
ifeq ($(CONFIG_PP),yes)
524
	$(MAKE) -C libpostproc $@
525
endif
526 503

  
527 504
install-headers:
528 505
	install -m 644 avcodec.h dsputil.h "$(incdir)"
529 506
	install -m 644 $(SRC_PATH)/libavcodec.pc "$(libdir)/pkgconfig"
530
ifeq ($(CONFIG_PP),yes)
531
	$(MAKE) -C libpostproc $@
532
endif
533 507

  
534 508
#
535 509
# include dependency files if they exist

Also available in: Unified diff