some simplifications

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21974 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2007-01-20 21:39:21 +00:00
parent 726ccc3118
commit c87711f2f7
1 changed files with 3 additions and 5 deletions

View File

@ -239,7 +239,7 @@ mencoder$(EXESUF): $(MENCODER_DEPS)
$(CC) -o $@ $^ $(LDFLAGS_MENCODER) $(CC) -o $@ $^ $(LDFLAGS_MENCODER)
codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h 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 codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
./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 codec-cfg.o: codecs.conf.h
codecs2html$(EXESUF): mp_msg.o codecs2html$(EXESUF): mp_msg.o
$(CC) -DCODECS2HTML codec-cfg.c mp_msg.o -o $@ $(CC) -DCODECS2HTML codec-cfg.c $^ -o $@
install: $(ALL_PRG) install: $(ALL_PRG)
ifeq ($(VIDIX),yes) ifeq ($(VIDIX),yes)
@ -258,9 +258,6 @@ endif
$(INSTALL) -d $(BINDIR) $(INSTALL) -d $(BINDIR)
$(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) \ $(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) \
$(BINDIR)/mplayer$(EXESUF) $(BINDIR)/mplayer$(EXESUF)
ifeq ($(GUI),yes)
-ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
endif
$(INSTALL) -d $(MANDIR)/man1 $(INSTALL) -d $(MANDIR)/man1
for i in $(MAN_LANG); do \ for i in $(MAN_LANG); do \
if test "$$i" = en ; then \ if test "$$i" = en ; then \
@ -284,6 +281,7 @@ endif
@$(INSTALL) -d $(DATADIR) @$(INSTALL) -d $(DATADIR)
@$(INSTALL) -d $(DATADIR)/font @$(INSTALL) -d $(DATADIR)/font
ifeq ($(GUI),yes) ifeq ($(GUI),yes)
-ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
@$(INSTALL) -d $(DATADIR)/skins @$(INSTALL) -d $(DATADIR)/skins
@echo "*** Download skin(s) at http://www.mplayerhq.hu/dload.html" @echo "*** Download skin(s) at http://www.mplayerhq.hu/dload.html"
@echo "*** for GUI, and extract to $(DATADIR)/skins/" @echo "*** for GUI, and extract to $(DATADIR)/skins/"