Mercurial > mplayer.hg

changeset 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 52c574919687
children 974f5ffb5097
files Makefile
diffstat 1 files changed, 19 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Mar 13 23:35:00 2007 +0000
+++ b/Makefile	Tue Mar 13 23:42:38 2007 +0000
@@ -14,6 +14,15 @@
 
 #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_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 @@
 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 @@
 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)