diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-06 21:52:50 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-06 21:52:50 +0000 |
| commit | 730bff7914c6f724e688d0551bc3938e20f39a94 (patch) | |
| tree | 90d0827210b31909e5abbd01088468dd7a7f7c8f | |
| parent | f4d87d3e88e4cb903d2440b2becb93dacbd81198 (diff) | |
| download | mpv-730bff7914c6f724e688d0551bc3938e20f39a94.tar.bz2 mpv-730bff7914c6f724e688d0551bc3938e20f39a94.tar.xz | |
100l: Revert previous accidental commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26337 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | Makefile | 19 |
1 files changed, 8 insertions, 11 deletions
@@ -43,12 +43,6 @@ SRCS_MPLAYER = mplayer.c \ 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 @@ COMMON_LIBS-$(ASS) += libass/libass.a 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 @@ INSTALL_TARGETS += $(INSTALL_TARGETS-yes) PARTS = dvdread \ gui \ + input \ liba52 \ libaf \ libao2 \ @@ -132,12 +128,10 @@ PARTS = dvdread \ 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/libosdep.a: 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 @@ clean:: -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/libvo.a: .norecurse $(wildcard libvo/*.[ch]) 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]) |