Mercurial > libavcodec.hg
changeset 3117:649af3fa175b libavcodec
Move libpostproc compilation to the top-level Makefile.
| author | diego |
|---|---|
| date | Sat, 11 Feb 2006 21:42:11 +0000 |
| parents | e5e4f74f006d |
| children | 01b58c3b8a91 |
| files | Makefile |
| diffstat | 1 files changed, 0 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sat Feb 11 20:54:40 2006 +0000 +++ b/Makefile Sat Feb 11 21:42:11 2006 +0000 @@ -300,15 +300,6 @@ 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 @@ $(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 @@ dsputil.o: dsputil.c dsputil.h -libpostproc/libpostproc.a: - $(MAKE) -C libpostproc - %.o: %.c $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< @@ -465,11 +450,9 @@ 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 @@ 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