Mercurial > mplayer.hg

comparison Makefile @ 22541:a7fc43264e8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cosmetics: Move some parts around to make more sense overall.
author diego
date Tue, 13 Mar 2007 23:42:38 +0000
parents af6dc9f0fa8b
children a80891080c9e
comparison
equal deleted inserted replaced
22540:52c574919687 22541:a7fc43264e8b
11 CFLAGS-$(CONFIG_LIBAVUTIL) += -I./libavutil 11 CFLAGS-$(CONFIG_LIBAVUTIL) += -I./libavutil
12 CFLAGS-$(CONFIG_LIBAVCODEC) += -I./libavcodec 12 CFLAGS-$(CONFIG_LIBAVCODEC) += -I./libavcodec
13 CFLAGS += $(CFLAGS-yes) 13 CFLAGS += $(CFLAGS-yes)
14 14
15 #CFLAGS += -Wall 15 #CFLAGS += -Wall
16
17 COMMON_LDFLAGS += $(EXTRA_LIB)\
18 $(EXTRALIBS) \
19
20 LDFLAGS_MPLAYER = $(EXTRALIBS_MPLAYER) \
21 $(COMMON_LDFLAGS) \
22
23 LDFLAGS_MENCODER = $(EXTRALIBS_MENCODER) \
24 $(COMMON_LDFLAGS) \
16 25
17 SRCS_COMMON = asxparser.c \ 26 SRCS_COMMON = asxparser.c \
18 codec-cfg.c \ 27 codec-cfg.c \
19 cpudetect.c \ 28 cpudetect.c \
20 edl.c \ 29 edl.c \
57 libao2/libao2.a \ 66 libao2/libao2.a \
58 input/libinput.a \ 67 input/libinput.a \
59 68
60 LIBS_MENCODER = libmpcodecs/libmpencoders.a \ 69 LIBS_MENCODER = libmpcodecs/libmpencoders.a \
61 libmpdemux/libmpmux.a \ 70 libmpdemux/libmpmux.a \
62
63 OBJS_COMMON = $(SRCS_COMMON:.c=.o)
64 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
65 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
66
67 # Having this in libosdep.a is not enough.
68 OBJS_MPLAYER-$(TARGET_WIN32) += osdep/mplayer-rc.o
69
70 MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(LIBS_MPLAYER) $(COMMON_LIBS)
71 MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(LIBS_MENCODER) $(COMMON_LIBS)
72 71
73 PARTS = libmpdemux \ 72 PARTS = libmpdemux \
74 stream \ 73 stream \
75 libmpcodecs \ 74 libmpcodecs \
76 libavutil \ 75 libavutil \
115 LIBS_MPLAYER-$(GUI) += Gui/libgui.a 114 LIBS_MPLAYER-$(GUI) += Gui/libgui.a
116 PARTS-$(GUI) += Gui 115 PARTS-$(GUI) += Gui
117 LIBS_MPLAYER-$(LIBMENU) += libmenu/libmenu.a 116 LIBS_MPLAYER-$(LIBMENU) += libmenu/libmenu.a
118 PARTS-$(LIBMENU) += libmenu 117 PARTS-$(LIBMENU) += libmenu
119 118
120 COMMON_LDFLAGS += $(EXTRA_LIB)\
121 $(EXTRALIBS) \
122
123 LDFLAGS_MPLAYER = $(EXTRALIBS_MPLAYER) \
124 $(COMMON_LDFLAGS) \
125
126 LDFLAGS_MENCODER = $(EXTRALIBS_MENCODER) \
127 $(COMMON_LDFLAGS) \
128
129 ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) 119 ALL_PRG-$(MPLAYER) += mplayer$(EXESUF)
130 ALL_PRG-$(MENCODER) += mencoder$(EXESUF) 120 ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
131 121
132 SRCS_COMMON += $(SRCS_COMMON-yes) 122 SRCS_COMMON += $(SRCS_COMMON-yes)
133 COMMON_LIBS += $(COMMON_LIBS-yes) 123 COMMON_LIBS += $(COMMON_LIBS-yes)
134 LIBS_MPLAYER += $(LIBS_MPLAYER-yes) 124 LIBS_MPLAYER += $(LIBS_MPLAYER-yes)
135 OBJS_MPLAYER += $(OBJS_MPLAYER-yes) 125 OBJS_MPLAYER += $(OBJS_MPLAYER-yes)
136 PARTS += $(PARTS-yes) 126 PARTS += $(PARTS-yes)
137 ALL_PRG += $(ALL_PRG-yes) 127 ALL_PRG += $(ALL_PRG-yes)
138 128
129 OBJS_COMMON = $(SRCS_COMMON:.c=.o)
130 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
131 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
132
133 # Having this in libosdep.a is not enough.
134 OBJS_MPLAYER-$(TARGET_WIN32) += osdep/mplayer-rc.o
135
139 COMMON_LIBS += osdep/libosdep.a 136 COMMON_LIBS += osdep/libosdep.a
137
138 MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(LIBS_MPLAYER) $(COMMON_LIBS)
139 MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(LIBS_MENCODER) $(COMMON_LIBS)
140 140
141 141
142 all: $(ALL_PRG) 142 all: $(ALL_PRG)
143 143
144 libaf/libaf.a: 144 libaf/libaf.a: