diff options
| author | François Revol <revol@free.fr> | 2003-02-06 15:09:39 +0000 |
|---|---|---|
| committer | François Revol <revol@free.fr> | 2003-02-06 15:09:39 +0000 |
| commit | cc0799e5f8ec3aeb5348c1803e882528a047890e (patch) | |
| tree | 08f0d64092d798c222992a1b6a23edfd239ec46f /libavformat/Makefile | |
| parent | 79134973d862af5e22cf8909df690e3e1d4b256e (diff) | |
Fix against C integrists breaks :P (hope I didn't break anything else)
Originally committed as revision 1547 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 36fbc0467f..94de787bcb 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -9,6 +9,7 @@ VPATH=$(SRC_PATH)/libavformat CFLAGS= $(OPTFLAGS) -Wall -g -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE OBJS= utils.o cutils.o allformats.o +PPOBJS= # mux and demuxes OBJS+=mpeg.o mpegts.o ffm.o crc.o img.o raw.o rm.o \ @@ -42,12 +43,12 @@ OBJS+= audio.o endif ifeq ($(CONFIG_AUDIO_BEOS),yes) -OBJS+= beosaudio.o +PPOBJS+= beosaudio.o endif ifeq ($(CONFIG_NETWORK),yes) OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o -# BeOS network stuff +# BeOS and Darwin network stuff ifeq ($(NEED_INET_ATON),yes) OBJS+= barpainet.o endif @@ -59,13 +60,13 @@ endif LIB= $(LIBPREF)avformat$(LIBSUF) -SRCS := $(OBJS:.o=.c) +SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp) all: $(LIB) -$(LIB): $(OBJS) +$(LIB): $(OBJS) $(PPOBJS) rm -f $@ - $(AR) rc $@ $(OBJS) + $(AR) rc $@ $(OBJS) $(PPOBJS) ifneq ($(CONFIG_OS2),yes) $(RANLIB) $@ endif |