Mercurial > mplayer.hg
changeset 26305:d2b880813c5e
100l: Revert previous accidental commit.
| author | diego |
|---|---|
| date | Sun, 06 Apr 2008 21:52:50 +0000 |
| parents | 5f526e8e3988 |
| children | b7dfef4f7a01 |
| files | Makefile |
| diffstat | 1 files changed, 8 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sun Apr 06 18:17:59 2008 +0000 +++ b/Makefile Sun Apr 06 21:52:50 2008 +0000 @@ -43,12 +43,6 @@ mixer.c \ parser-mpcmd.c \ command.c \ - input/input.c \ - -SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c -SRCS_MPLAYER-$(JOYSTICK) += input/joystick.c -SRCS_MPLAYER-$(LIRC) += input/lirc.c - SRCS_MENCODER = mencoder.c \ mp_msg-mencoder.c \ @@ -78,6 +72,7 @@ LIBS_MPLAYER = libvo/libvo.a \ libao2/libao2.a \ + input/libinput.a \ LIBS_MPLAYER-$(VIDIX) += vidix/libvidix.a LIBS_MPLAYER-$(GUI) += gui/libgui.a @@ -109,6 +104,7 @@ PARTS = dvdread \ gui \ + input \ liba52 \ libaf \ libao2 \ @@ -132,12 +128,10 @@ tremor \ vidix \ -DIRS = input \ all: $(ALL_PRG) -.depend: help_mp.h version.h codecs.conf.h -dep depend:: +dep depend:: help_mp.h version.h codecs.conf.h @for a in $(PARTS); do $(MAKE) -C $$a dep; done include mpcommon.mak @@ -222,6 +216,9 @@ osdep/mplayer-rc.o: version.h $(MAKE) -C osdep mplayer-rc.o +input/libinput.a: + $(MAKE) -C input + libmenu/libmenu.a: $(MAKE) -C libmenu @@ -305,8 +302,7 @@ -rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \ codecs2html$(EXESUF) codec-cfg-test$(EXESUF) cpuinfo$(EXESUF) \ codecs.conf.h help_mp.h version.h TAGS tags - #@for a in $(PARTS); do $(MAKE) -C $$a clean; done - for dir in $(DIRS); do rm -f $$dir/*.o $$dir/*.a $$dir/*.ho $$dir/*~ ; done + @for a in $(PARTS); do $(MAKE) -C $$a clean; done distclean:: doxygen_clean @for a in $(PARTS); do $(MAKE) -C $$a distclean; done @@ -384,6 +380,7 @@ libvo/libosd.a: .norecurse $(wildcard libvo/*.[ch]) libao2/libao2.a: .norecurse $(wildcard libao2/*.[ch]) osdep/libosdep.a: .norecurse $(wildcard osdep/*.[ch]) +input/libinput.a: .norecurse $(wildcard input/*.[ch]) libmenu/libmenu.a: .norecurse $(wildcard libmenu/*.[ch]) libaf/libaf.a: .norecurse $(wildcard libaf/*.[ch])