[MPlayer-cvslog] r21326 - in trunk: Makefile libmpdemux/Makefile

[diego]

Author: diego
Date: Mon Nov 27 15:26:52 2006
New Revision: 21326

Modified:
   trunk/Makefile
   trunk/libmpdemux/Makefile

Log:
Split muxers into a separate library that only MEncoder is linked against.


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Mon Nov 27 15:26:52 2006
@@ -66,6 +66,7 @@
                input/libinput.a \
 
 LIBS_MENCODER = libmpcodecs/libmpencoders.a \
+                libmpdemux/libmpmux.a \
 
 OBJS_MPLAYER  = $(SRCS_MPLAYER:.c=.o)
 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
@@ -165,7 +166,10 @@
 	$(MAKE) -C libass
 
 libmpdemux/libmpdemux.a:
-	$(MAKE) -C libmpdemux
+	$(MAKE) -C libmpdemux libmpdemux.a
+
+libmpdemux/libmpmux.a:
+	$(MAKE) -C libmpdemux libmpmux.a
 
 stream/stream.a:
 	$(MAKE) -C stream
@@ -393,6 +397,7 @@
 libdvdcss/libdvdcss.a: .norecurse $(wildcard libdvdcss/*.[ch])
 
 libmpdemux/libmpdemux.a: .norecurse $(wildcard libmpdemux/*.[ch])
+libmpdemux/libmpmux.a: .norecurse $(wildcard libmpdemux/*.[ch])
 stream/stream.a: .norecurse $(wildcard stream/*.[ch] stream/*/*.[ch])
 libmpcodecs/libmpcodecs.a: .norecurse $(wildcard libmpcodecs/*.[ch]) $(wildcard libmpcodecs/native/*.[ch])
 libmpcodecs/libmpencoders.a: .norecurse $(wildcard libmpcodecs/*.[ch])

Modified: trunk/libmpdemux/Makefile
==============================================================================
--- trunk/libmpdemux/Makefile	(original)
+++ trunk/libmpdemux/Makefile	Mon Nov 27 15:26:52 2006
@@ -1,8 +1,11 @@
 
-LIBNAME = libmpdemux.a
-
 include ../config.mak
 
+LIBNAME = libmpdemux.a
+ifeq ($(MENCODER),yes)
+LIBNAME2 = libmpmux.a
+endif
+
 # Headers and header-dumpers
 SRCS  = mp3_hdr.c \
         mpeg_hdr.c \
@@ -63,18 +66,14 @@
 SRCS-$(WIN32DLL)                += demux_avs.c
 SRCS-$(XMMS_PLUGINS)            += demux_xmms.c
 
-# Muxers
-MUXERS = muxer.c \
+SRCS2 = muxer.c \
         muxer_avi.c \
         muxer_mpeg.c \
         muxer_rawaudio.c \
         muxer_rawvideo.c \
 
-MUXERS-$(CONFIG_LIBAVFORMAT)    += muxer_lavf.c
-MUXERS-$(CONFIG_LIBAVFORMAT_SO) += muxer_lavf.c
-
-SRCS-$(MENCODER) += $(MUXERS)
-SRCS-$(MENCODER) += $(MUXERS-yes)
+SRCS2-$(CONFIG_LIBAVFORMAT)     += muxer_lavf.c
+SRCS2-$(CONFIG_LIBAVFORMAT_SO)  += muxer_lavf.c
 
 LIBAV_INC-$(CONFIG_LIBAVUTIL)   += -I../libavutil
 LIBAV_INC-$(CONFIG_LIBAVCODEC)  += -I../libavcodec