summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-20 21:39:21 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-20 21:39:21 +0000
commitc87711f2f7ca22a4ab7db25b41e387e2bf272aa3 (patch)
tree1779129d67cddba602c85b9ee1d383eab7e94f25
parent726ccc3118670677fb1f1be2c9e261a67a9a56ac (diff)
downloadmpv-c87711f2f7ca22a4ab7db25b41e387e2bf272aa3.tar.bz2
mpv-c87711f2f7ca22a4ab7db25b41e387e2bf272aa3.tar.xz
some simplifications
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21974 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index ccb92dbe7d..7c5bd9dc2b 100644
--- a/Makefile
+++ b/Makefile
@@ -239,7 +239,7 @@ mencoder$(EXESUF): $(MENCODER_DEPS)
$(CC) -o $@ $^ $(LDFLAGS_MENCODER)
codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
- $(HOST_CC) -I. -DCODECS2HTML codec-cfg.c -o $@
+ $(HOST_CC) -I. -DCODECS2HTML $< -o $@
codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
./codec-cfg$(EXESUF) ./etc/codecs.conf > $@
@@ -247,7 +247,7 @@ codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
codec-cfg.o: codecs.conf.h
codecs2html$(EXESUF): mp_msg.o
- $(CC) -DCODECS2HTML codec-cfg.c mp_msg.o -o $@
+ $(CC) -DCODECS2HTML codec-cfg.c $^ -o $@
install: $(ALL_PRG)
ifeq ($(VIDIX),yes)
@@ -258,9 +258,6 @@ endif
$(INSTALL) -d $(BINDIR)
$(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) \
$(BINDIR)/mplayer$(EXESUF)
-ifeq ($(GUI),yes)
- -ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
-endif
$(INSTALL) -d $(MANDIR)/man1
for i in $(MAN_LANG); do \
if test "$$i" = en ; then \
@@ -284,6 +281,7 @@ endif
@$(INSTALL) -d $(DATADIR)
@$(INSTALL) -d $(DATADIR)/font
ifeq ($(GUI),yes)
+ -ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
@$(INSTALL) -d $(DATADIR)/skins
@echo "*** Download skin(s) at http://www.mplayerhq.hu/dload.html"
@echo "*** for GUI, and extract to $(DATADIR)/skins/"