diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-02-11 21:42:11 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-02-11 21:42:11 +0000 |
| commit | 1a9150b194b7d9347114875806d29d650d3d0658 (patch) | |
| tree | 742f5d3101aed3efec32ba4290c2766302977d3b /libavcodec | |
| parent | 26d469117fd544fab3cdbbf5f4a042bc395c54af (diff) | |
Move libpostproc compilation to the top-level Makefile.
Originally committed as revision 4993 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 26 |
1 files changed, 0 insertions, 26 deletions
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 |