diff options
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | libavcodec/Makefile | 26 |
2 files changed, 14 insertions, 26 deletions
@@ -67,6 +67,9 @@ lib: $(MAKE) -C libavutil all $(MAKE) -C libavcodec all $(MAKE) -C libavformat all +ifeq ($(CONFIG_PP),yes) + $(MAKE) -C libavcodec/libpostproc all +endif ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS) @@ -140,12 +143,18 @@ ifeq ($(BUILD_SHARED),yes) $(MAKE) -C libavutil install-lib-shared $(MAKE) -C libavcodec install-lib-shared $(MAKE) -C libavformat install-lib-shared +ifeq ($(CONFIG_PP),yes) + $(MAKE) -C libavcodec/libpostproc install-lib-shared +endif $(LDCONFIG) || true endif ifeq ($(BUILD_STATIC),yes) $(MAKE) -C libavutil install-lib-static $(MAKE) -C libavcodec install-lib-static $(MAKE) -C libavformat install-lib-static +ifeq ($(CONFIG_PP),yes) + $(MAKE) -C libavcodec/libpostproc install-lib-static +endif endif install-headers: @@ -154,6 +163,9 @@ install-headers: $(MAKE) -C libavutil install-headers $(MAKE) -C libavcodec install-headers $(MAKE) -C libavformat install-headers +ifeq ($(CONFIG_PP),yes) + $(MAKE) -C libavcodec/libpostproc install-headers +endif dep: depend @@ -175,6 +187,7 @@ clean: $(MAKE) -C libavutil clean $(MAKE) -C libavcodec clean $(MAKE) -C libavformat clean + $(MAKE) -C libavcodec/libpostproc clean $(MAKE) -C tests clean $(MAKE) -C vhook clean rm -f *.o *.d *~ .libs gmon.out TAGS \ @@ -185,6 +198,7 @@ distclean: clean $(MAKE) -C libavutil distclean $(MAKE) -C libavcodec distclean $(MAKE) -C libavformat distclean + $(MAKE) -C libavcodec/libpostproc distclean $(MAKE) -C tests distclean $(MAKE) -C vhook distclean rm -f .depend config.mak config.h *.pc diff --git a/libavcodec/Makefile b/libavcodec/Makefile index fe178f7c87..50e42606ee 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -300,15 +300,6 @@ ifeq ($(CONFIG_X264),yes) OBJS+= x264.o endif -ifeq ($(CONFIG_PP),yes) -ifeq ($(BUILD_SHARED),yes) -EXTRALIBS += -Llibpostproc -lpostproc$(BUILDSUF) -else -# LIBS += libpostproc/libpostproc.a ... should be fixed -OBJS += libpostproc/postprocess.o -endif -endif - ifeq ($(CONFIG_MP3LAME),yes) OBJS += mp3lameaudio.o endif @@ -428,9 +419,6 @@ $(LIB): $(OBJS) $(AMRLIBS) $(RANLIB) $@ $(SLIBNAME): $(OBJS) -ifeq ($(CONFIG_PP),yes) - $(MAKE) -C libpostproc -endif $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) ifeq ($(CONFIG_WIN32),yes) -lib /machine:i386 /def:$(@:.dll=.def) @@ -438,9 +426,6 @@ endif dsputil.o: dsputil.c dsputil.h -libpostproc/libpostproc.a: - $(MAKE) -C libpostproc - %.o: %.c $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< @@ -465,11 +450,9 @@ clean: $(CLEANAMR) sparc/*.o sparc/*~ \ liba52/*.o liba52/*~ \ apiexample $(TESTS) - $(MAKE) -C libpostproc clean distclean: clean rm -f .depend - $(MAKE) -C libpostproc distclean cleanamr: $(MAKE) -C amr clean @@ -514,22 +497,13 @@ else ln -sf $(SLIBNAME_WITH_VERSION) \ $(libdir)/$(SLIBNAME) endif -ifeq ($(CONFIG_PP),yes) - $(MAKE) -C libpostproc $@ -endif install-lib-static: $(LIB) install -m 644 $(LIB) "$(libdir)" -ifeq ($(CONFIG_PP),yes) - $(MAKE) -C libpostproc $@ -endif install-headers: install -m 644 avcodec.h dsputil.h "$(incdir)" install -m 644 $(SRC_PATH)/libavcodec.pc "$(libdir)/pkgconfig" -ifeq ($(CONFIG_PP),yes) - $(MAKE) -C libpostproc $@ -endif # # include dependency files if they exist |