diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-13 23:42:38 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-13 23:42:38 +0000 |
| commit | 1c47e97b9c259983b1cdbe46ef6579d7cd2c4d2f (patch) | |
| tree | 2d3223afc8aec722f527d3b64ca8b9add6a60df0 /Makefile | |
| parent | 43cbd97f1782f5604b09c7b65d41edc97b9e9df1 (diff) | |
| download | mpv-1c47e97b9c259983b1cdbe46ef6579d7cd2c4d2f.tar.bz2 mpv-1c47e97b9c259983b1cdbe46ef6579d7cd2c4d2f.tar.xz | |
cosmetics: Move some parts around to make more sense overall.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22559 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 38 |
1 files changed, 19 insertions, 19 deletions
@@ -14,6 +14,15 @@ CFLAGS += $(CFLAGS-yes) #CFLAGS += -Wall +COMMON_LDFLAGS += $(EXTRA_LIB)\ + $(EXTRALIBS) \ + +LDFLAGS_MPLAYER = $(EXTRALIBS_MPLAYER) \ + $(COMMON_LDFLAGS) \ + +LDFLAGS_MENCODER = $(EXTRALIBS_MENCODER) \ + $(COMMON_LDFLAGS) \ + SRCS_COMMON = asxparser.c \ codec-cfg.c \ cpudetect.c \ @@ -60,16 +69,6 @@ LIBS_MPLAYER = libvo/libvo.a \ LIBS_MENCODER = libmpcodecs/libmpencoders.a \ libmpdemux/libmpmux.a \ -OBJS_COMMON = $(SRCS_COMMON:.c=.o) -OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o) -OBJS_MENCODER = $(SRCS_MENCODER:.c=.o) - -# Having this in libosdep.a is not enough. -OBJS_MPLAYER-$(TARGET_WIN32) += osdep/mplayer-rc.o - -MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(LIBS_MPLAYER) $(COMMON_LIBS) -MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(LIBS_MENCODER) $(COMMON_LIBS) - PARTS = libmpdemux \ stream \ libmpcodecs \ @@ -117,15 +116,6 @@ PARTS-$(GUI) += Gui LIBS_MPLAYER-$(LIBMENU) += libmenu/libmenu.a PARTS-$(LIBMENU) += libmenu -COMMON_LDFLAGS += $(EXTRA_LIB)\ - $(EXTRALIBS) \ - -LDFLAGS_MPLAYER = $(EXTRALIBS_MPLAYER) \ - $(COMMON_LDFLAGS) \ - -LDFLAGS_MENCODER = $(EXTRALIBS_MENCODER) \ - $(COMMON_LDFLAGS) \ - ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) ALL_PRG-$(MENCODER) += mencoder$(EXESUF) @@ -136,8 +126,18 @@ OBJS_MPLAYER += $(OBJS_MPLAYER-yes) PARTS += $(PARTS-yes) ALL_PRG += $(ALL_PRG-yes) +OBJS_COMMON = $(SRCS_COMMON:.c=.o) +OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o) +OBJS_MENCODER = $(SRCS_MENCODER:.c=.o) + +# Having this in libosdep.a is not enough. +OBJS_MPLAYER-$(TARGET_WIN32) += osdep/mplayer-rc.o + COMMON_LIBS += osdep/libosdep.a +MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(LIBS_MPLAYER) $(COMMON_LIBS) +MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(LIBS_MENCODER) $(COMMON_LIBS) + all: $(ALL_PRG) |