Apply cosmetic cleanup part of ldflags_order patch from Alberto Villa.

[melted] / src / modules / avformat / Makefile

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index 38bfbec..7d88943 100644 (file)
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -1,34 +1,50 @@
 include ../../../config.mak
-include config.mak
 
-TARGET = ../libmltavformat$(LIBSUF)
+CFLAGS += -I../..
+
+LDFLAGS += -L../../framework -lmlt
+
+include config.mak
 
-OBJS = factory.o \
-          producer_avformat.o \
-          consumer_avformat.o \
-          filter_avcolour_space.o \
-          filter_avresample.o
+LDFLAGS += -lavformat$(AVFORMAT_SUFFIX)
+LDFLAGS += -lavcodec$(AVFORMAT_SUFFIX)
+LDFLAGS += -lavutil$(AVFORMAT_SUFFIX)
+LDFLAGS += -lavdevice$(AVFORMAT_SUFFIX) $(EXTRA_LIBS)
 
-ifdef MMX_FLAGS
-       OBJS += filter_avdeinterlace.o
+ifndef CODECS
+TARGET = ../libmltffmpeg$(LIBSUF)
+else
+TARGET = ../libmltavformat$(LIBSUF)
 endif
 
-CFLAGS+=-I../..
+OBJS = factory.o
 
-LDFLAGS+=-L../../framework
+ifdef FILTERS
+OBJS += filter_avcolour_space.o \
+           filter_avresample.o \
+           filter_avdeinterlace.o
+ifdef SWSCALE
+OBJS += filter_swscale.o
+endif
+CFLAGS += -DFILTERS
+endif
 
-LDFLAGS+=-lavformat$(AVFORMAT_SUFFIX) -lavcodec$(AVFORMAT_SUFFIX) -lavutil$(AVFORMAT_SUFFIX) -lavdevice$(AVFORMAT_SUFFIX) $(EXTRA_LIBS) -lmlt
+ifdef CODECS
+OBJS += producer_avformat.o \
+           consumer_avformat.o
+CFLAGS += -DCODECS
+endif
 
 ifdef SWSCALE
-       CFLAGS+=-DSWSCALE
-       LDFLAGS+=-lswscale$(AVFORMAT_SUFFIX)
+CFLAGS += -DSWSCALE
+LDFLAGS += -lswscale$(AVFORMAT_SUFFIX)
 endif
 
 ifdef LOCAL_FFMPEG
-       LOCAL_FFMPEG_OBJS = ffmpeg/libavformat/libavformat$(AVFORMAT_SUFFIX) \
-                           ffmpeg/libavcodec/libavcodec$(AVFORMAT_SUFFIX) \
-                           ffmpeg/libavutil/libavutil$(AVFORMAT_SUFFIX) \
-                           ffmpeg/libavutil/libavdevice$(AVFORMAT_SUFFIX)
+LOCAL_FFMPEG_OBJS = ffmpeg/libavformat/libavformat$(AVFORMAT_SUFFIX) \
+                    ffmpeg/libavcodec/libavcodec$(AVFORMAT_SUFFIX) \
+                    ffmpeg/libavutil/libavutil$(AVFORMAT_SUFFIX) \
+                    ffmpeg/libavutil/libavdevice$(AVFORMAT_SUFFIX)
 endif
 
 SRCS := $(OBJS:.o=.c)
@@ -37,7 +53,7 @@ all:  $(TARGET)
 
 $(LOCAL_FFMPEG_OBJS):
        if [ $(LOCAL_FFMPEG) ] ; then \
-               $(MAKE) -C ffmpeg lib ; \
+               $(MAKE) -C ffmpeg ffmpeg ; \
        fi
 
 $(TARGET): $(OBJS) $(LOCAL_FFMPEG_OBJS)
@@ -53,7 +69,7 @@ distclean:    clean
 
 clean: 
        #if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg clean ; fi
-       rm -f $(OBJS) $(TARGET)
+       rm -f $(OBJS) ../libmltffmpeg$(LIBSUF) ../libmltavformat$(LIBSUF)
 
 install: all
        install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
@@ -61,8 +77,9 @@ install: all
        install -m 644 producer_avformat.yml "$(DESTDIR)$(prefix)/share/mlt/avformat"
 
 uninstall:
-       rm "$(DESTDIR)$(libdir)/mlt/libmltavformat$(LIBSUF)"
-       rm -rf "$(DESTDIR)$(prefix)/share/mlt/avformat" 
+       rm "$(DESTDIR)$(libdir)/mlt/libmltavformat$(LIBSUF)" 2> /dev/null || true
+       rm "$(DESTDIR)$(libdir)/mlt/libmltffmpeg$(LIBSUF)" 2> /dev/null || true
+       rm -rf "$(DESTDIR)$(prefix)/share/mlt/avformat"
 
 ifneq ($(wildcard .depend),)
 include .depend