comparison Makefile @ 21085:6a152d4ee3ae

Rename variables for consistency.
author diego
date Mon, 20 Nov 2006 13:38:21 +0000
parents 030c2818f7e9
children 05dc49be14cb
comparison
equal deleted inserted replaced
21084:030c2818f7e9 21085:6a152d4ee3ae
98 libaf/libaf.a \ 98 libaf/libaf.a \
99 99
100 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o) 100 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
101 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o) 101 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
102 102
103 MPLAYER_DEP = $(OBJS_MPLAYER) $(COMMON_DEPS) 103 MPLAYER_DEPS = $(OBJS_MPLAYER) $(COMMON_DEPS)
104 MENCODER_DEP = $(OBJS_MENCODER) $(COMMON_DEPS) libmpcodecs/libmpencoders.a 104 MENCODER_DEPS = $(OBJS_MENCODER) $(COMMON_DEPS) libmpcodecs/libmpencoders.a
105 105
106 PARTS = libmpdemux \ 106 PARTS = libmpdemux \
107 stream \ 107 stream \
108 libmpcodecs \ 108 libmpcodecs \
109 libavutil \ 109 libavutil \
175 COMMON_DEPS += Gui/libgui.a 175 COMMON_DEPS += Gui/libgui.a
176 LIBS_MPLAYER += Gui/libgui.a $(GTK_LIBS) 176 LIBS_MPLAYER += Gui/libgui.a $(GTK_LIBS)
177 PARTS += Gui 177 PARTS += Gui
178 endif 178 endif
179 ifeq ($(LIBMENU),yes) 179 ifeq ($(LIBMENU),yes)
180 MPLAYER_DEP += libmenu/libmenu.a 180 MPLAYER_DEPS += libmenu/libmenu.a
181 LIBS_MPLAYER += libmenu/libmenu.a 181 LIBS_MPLAYER += libmenu/libmenu.a
182 PARTS += libmenu 182 PARTS += libmenu
183 endif 183 endif
184 ifeq ($(TARGET_WIN32),yes) 184 ifeq ($(TARGET_WIN32),yes)
185 OBJS_MPLAYER += osdep/mplayer-rc.o 185 OBJS_MPLAYER += osdep/mplayer-rc.o
281 $(MAKE) -C input 281 $(MAKE) -C input
282 282
283 libmenu/libmenu.a: 283 libmenu/libmenu.a:
284 $(MAKE) -C libmenu 284 $(MAKE) -C libmenu
285 285
286 mplayer$(EXESUF): $(MPLAYER_DEP) 286 mplayer$(EXESUF): $(MPLAYER_DEPS)
287 $(CC) -o $@ $(OBJS_MPLAYER) $(LIBS_MPLAYER) 287 $(CC) -o $@ $(OBJS_MPLAYER) $(LIBS_MPLAYER)
288 288
289 mencoder$(EXESUF): $(MENCODER_DEP) 289 mencoder$(EXESUF): $(MENCODER_DEPS)
290 $(CC) -o $@ $(OBJS_MENCODER) $(LIBS_MENCODER) 290 $(CC) -o $@ $(OBJS_MENCODER) $(LIBS_MENCODER)
291 291
292 osdep/mplayer-rc.o: osdep/mplayer.rc 292 osdep/mplayer-rc.o: osdep/mplayer.rc
293 windres -o $@ osdep/mplayer.rc 293 windres -o $@ osdep/mplayer.rc
294 294
417 417
418 # explicit dependencies to force version.h to be built even if .depend is missing 418 # explicit dependencies to force version.h to be built even if .depend is missing
419 mplayer.o mencoder.o vobsub.o: version.h 419 mplayer.o mencoder.o vobsub.o: version.h
420 420
421 # temporary measure to make sure help_mp.h is built. we desperately need correct deps! 421 # temporary measure to make sure help_mp.h is built. we desperately need correct deps!
422 $(MPLAYER_DEP) $(MENCODER_DEP): help_mp.h 422 $(MPLAYER_DEPS) $(MENCODER_DEPS): help_mp.h
423 423
424 # 424 #
425 # the following lines provide _partial_ dependency information 425 # the following lines provide _partial_ dependency information
426 # for the 'library' directories under main dir, in order to cause 426 # for the 'library' directories under main dir, in order to cause
427 # the build process to recursively descend into them if something 427 # the build process to recursively descend into them if something